From b37f62fc1fabf75358867fc931591278923288aa Mon Sep 17 00:00:00 2001
From: Jordan Longstaff <JordanLongstaff@users.noreply.github.com>
Date: Fri, 6 Jun 2025 12:00:02 -0400
Subject: [PATCH 1/4] Child Ruto Part 4: Eye and mouth index enums (#2571)

* Child Ruto Part 4: Eye and mouth index enums

* Suggested changes

* Rename struct variables
---
 src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 65 ++++++++++++++---------
 src/overlays/actors/ovl_En_Ru1/z_en_ru1.h |  4 +-
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index aea5f9ba2e..850d1177e3 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -90,6 +90,21 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play);
 void EnRu1_DrawOpa(EnRu1* this, PlayState* play);
 void EnRu1_DrawXlu(EnRu1* this, PlayState* play);
 
+typedef enum EnRu1Eyes {
+    /* 0 */ ENRU1_EYES_OPEN,
+    /* 1 */ ENRU1_EYES_HALF_BLINK,
+    /* 2 */ ENRU1_EYES_CLOSED,
+    /* 3 */ ENRU1_EYES_UP,
+    /* 4 */ ENRU1_EYES_GAZING,
+    /* 5 */ ENRU1_EYES_BLUSH,
+} EnRu1Eyes;
+
+typedef enum EnRu1Mouth {
+    /* 0 */ ENRU1_MOUTH_SMILING,
+    /* 1 */ ENRU1_MOUTH_FROWNING,
+    /* 2 */ ENRU1_MOUTH_OPEN,
+} EnRu1Mouth;
+
 typedef enum EnRu1WaterState {
     /* 0 */ ENRU1_WATER_OUTSIDE,
     /* 1 */ ENRU1_WATER_IMMERSED,
@@ -237,24 +252,24 @@ void EnRu1_Destroy(Actor* thisx, PlayState* play) {
 void EnRu1_UpdateEyes(EnRu1* this) {
     s32 pad[3];
     s16* blinkTimer = &this->blinkTimer;
-    s16* eyeIndex = &this->eyeIndex;
+    s16* eyes = &this->eyes;
 
     if (DECR(*blinkTimer) == 0) {
         *blinkTimer = Rand_S16Offset(60, 60);
     }
 
-    *eyeIndex = *blinkTimer;
-    if (*eyeIndex >= 3) {
-        *eyeIndex = 0;
+    *eyes = *blinkTimer;
+    if (*eyes >= ENRU1_EYES_UP) {
+        *eyes = ENRU1_EYES_OPEN;
     }
 }
 
-void EnRu1_SetEyeIndex(EnRu1* this, s16 eyeIndex) {
-    this->eyeIndex = eyeIndex;
+void EnRu1_SetEyes(EnRu1* this, s16 eyes) {
+    this->eyes = eyes;
 }
 
-void EnRu1_SetMouthIndex(EnRu1* this, s16 mouthIndex) {
-    this->mouthIndex = mouthIndex;
+void EnRu1_SetMouth(EnRu1* this, s16 mouth) {
+    this->mouth = mouth;
 }
 
 void func_80AEAECC(EnRu1* this, PlayState* play) {
@@ -436,8 +451,8 @@ void EnRu1_InitOutsideJabuJabu(EnRu1* this, PlayState* play) {
     EnRu1_AnimationChange(this, &gRutoChildWaitHandsBehindBackAnim, ANIMMODE_LOOP, 0, false);
     this->action = 0;
     this->drawConfig = 1;
-    EnRu1_SetEyeIndex(this, 4);
-    EnRu1_SetMouthIndex(this, 0);
+    EnRu1_SetEyes(this, ENRU1_EYES_GAZING);
+    EnRu1_SetMouth(this, ENRU1_MOUTH_SMILING);
 }
 
 CsCmdActorCue* EnRu1_GetCueChannel3(PlayState* play) {
@@ -793,7 +808,7 @@ void EnRu1_InitInJabuJabuHolesRoom(EnRu1* this, PlayState* play) {
     if (!GET_INFTABLE(INFTABLE_141)) {
         EnRu1_AnimationChange(this, &gRutoChildWait2Anim, ANIMMODE_LOOP, 0, false);
         this->action = 7;
-        EnRu1_SetMouthIndex(this, 1);
+        EnRu1_SetMouth(this, ENRU1_MOUTH_FROWNING);
     } else if (GET_INFTABLE(INFTABLE_147) && !GET_INFTABLE(INFTABLE_140) && !GET_INFTABLE(INFTABLE_145)) {
         if (!func_80AEB020(this, play)) {
             s8 actorRoom;
@@ -1038,8 +1053,8 @@ void EnRu1_InitInBossRoom(EnRu1* this, PlayState* play) {
     EnRu1_AnimationChange(this, &gRutoChildWaitHandsOnHipsAnim, ANIMMODE_LOOP, 0, false);
     this->action = 15;
     this->actor.shape.yOffset = -10000.0f;
-    EnRu1_SetEyeIndex(this, 5);
-    EnRu1_SetMouthIndex(this, 2);
+    EnRu1_SetEyes(this, ENRU1_EYES_BLUSH);
+    EnRu1_SetMouth(this, ENRU1_MOUTH_OPEN);
 }
 
 void func_80AECE04(EnRu1* this, PlayState* play) {
@@ -1968,8 +1983,8 @@ void func_80AEF51C(EnRu1* this) {
 
 void func_80AEF540(EnRu1* this) {
     if (EnRu1_GetPlatformCamSetting(this) == 2) {
-        EnRu1_SetEyeIndex(this, 3);
-        EnRu1_SetMouthIndex(this, 2);
+        EnRu1_SetEyes(this, ENRU1_EYES_UP);
+        EnRu1_SetMouth(this, ENRU1_MOUTH_OPEN);
         if (this->skelAnime.mode != 2) {
             EnRu1_AnimationChange(this, &gRutoChildShutterAnim, ANIMMODE_ONCE, -8.0f, false);
             func_80AEF51C(this);
@@ -1983,8 +1998,8 @@ void func_80AEF5B8(EnRu1* this) {
     if (D_80AF1938 == 0) {
         curFrame = this->skelAnime.curFrame;
         if (curFrame >= 60.0f) {
-            EnRu1_SetEyeIndex(this, 3);
-            EnRu1_SetMouthIndex(this, 0);
+            EnRu1_SetEyes(this, ENRU1_EYES_UP);
+            EnRu1_SetMouth(this, ENRU1_MOUTH_SMILING);
             func_80AED57C(this);
             D_80AF1938 = 1;
         }
@@ -2380,11 +2395,11 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play) {
 
 void EnRu1_DrawOpa(EnRu1* this, PlayState* play) {
     s32 pad[2];
-    s16 eyeIndex = this->eyeIndex;
-    void* eyeTex = sEyeTextures[eyeIndex];
-    s16 mouthIndex = this->mouthIndex;
+    s16 eyes = this->eyes;
+    void* eyeTex = sEyeTextures[eyes];
+    s16 mouth = this->mouth;
     SkelAnime* skelAnime = &this->skelAnime;
-    void* mouthTex = sMouthTextures[mouthIndex];
+    void* mouthTex = sMouthTextures[mouth];
     s32 pad1;
 
     OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1282);
@@ -2405,11 +2420,11 @@ void EnRu1_DrawOpa(EnRu1* this, PlayState* play) {
 
 void EnRu1_DrawXlu(EnRu1* this, PlayState* play) {
     s32 pad[2];
-    s16 eyeIndex = this->eyeIndex;
-    void* eyeTex = sEyeTextures[eyeIndex];
-    s16 mouthIndex = this->mouthIndex;
+    s16 eyes = this->eyes;
+    void* eyeTex = sEyeTextures[eyes];
+    s16 mouth = this->mouth;
     SkelAnime* skelAnime = &this->skelAnime;
-    void* mouthTex = sMouthTextures[mouthIndex];
+    void* mouthTex = sMouthTextures[mouth];
     s32 pad1;
 
     OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1324);
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
index 80f1bccb13..b4faf8d3f4 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
@@ -21,9 +21,9 @@ typedef struct EnRu1 {
     /* 0x014C */ SkelAnime skelAnime;
     /* 0x0190 */ Vec3s jointTable[17];
     /* 0x01F6 */ Vec3s morphTable[17];
-    /* 0x025C */ s16 eyeIndex;
+    /* 0x025C */ s16 eyes;
     /* 0x025E */ s16 blinkTimer;
-    /* 0x0260 */ s16 mouthIndex;
+    /* 0x0260 */ s16 mouth;
     /* 0x0264 */ s32 action;
     /* 0x0268 */ s32 drawConfig;
     /* 0x026C */ f32 unk_26C;

From 597bd27f5b4ea4768c8d7f85dcaaf902383d768c Mon Sep 17 00:00:00 2001
From: Jordan Longstaff <JordanLongstaff@users.noreply.github.com>
Date: Fri, 6 Jun 2025 12:17:11 -0400
Subject: [PATCH 2/4] Child Ruto Part 7: Limb draw functions (#2575)

* Child Ruto Part 7: Limb draw functions

* Add comment

* Rename vectors, remove comment

* Rename again
---
 src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 25 ++++++++++++-----------
 src/overlays/actors/ovl_En_Ru1/z_en_ru1.h |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index 850d1177e3..575755d445 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -84,7 +84,7 @@ void func_80AEFC24(EnRu1* this, PlayState* play);
 void func_80AEFECC(EnRu1* this, PlayState* play);
 void func_80AEFF40(EnRu1* this, PlayState* play);
 
-void func_80AF0278(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot);
+void EnRu1_PreLimbDraw(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot);
 
 void EnRu1_DrawNothing(EnRu1* this, PlayState* play);
 void EnRu1_DrawOpa(EnRu1* this, PlayState* play);
@@ -164,7 +164,7 @@ static EnRu1ActionFunc sActionFuncs[] = {
 };
 
 static EnRu1PreLimbDrawFunc sPreLimbDrawFuncs[] = {
-    func_80AF0278,
+    EnRu1_PreLimbDraw,
 };
 
 static Vec3f sMultVec = { 0.0f, 10.0f, 0.0f };
@@ -2343,7 +2343,7 @@ void EnRu1_Init(Actor* thisx, PlayState* play) {
     }
 }
 
-void func_80AF0278(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot) {
+void EnRu1_PreLimbDraw(EnRu1* this, PlayState* play, s32 limbIndex, Vec3s* rot) {
     Vec3s* torsoRot = &this->interactInfo.torsoRot;
     Vec3s* headRot = &this->interactInfo.headRot;
 
@@ -2363,11 +2363,12 @@ s32 EnRu1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
                            Gfx** gfx) {
     EnRu1* this = (EnRu1*)thisx;
 
-    if ((this->unk_290 < 0) || (this->unk_290 > 0) || (*sPreLimbDrawFuncs[this->unk_290] == NULL)) {
+    if ((this->preLimbDrawIndex < 0) || (this->preLimbDrawIndex > 0) ||
+        (*sPreLimbDrawFuncs[this->preLimbDrawIndex] == NULL)) {
         PRINTF(VT_FGCOL(RED) T("首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n",
                                "Neck rotation mode is improper!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
     } else {
-        sPreLimbDrawFuncs[this->unk_290](this, play, limbIndex, rot);
+        sPreLimbDrawFuncs[this->preLimbDrawIndex](this, play, limbIndex, rot);
     }
     return false;
 }
@@ -2376,14 +2377,14 @@ void EnRu1_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
     EnRu1* this = (EnRu1*)thisx;
 
     if (limbIndex == RUTO_CHILD_HEAD) {
-        Vec3f vec1;
-        Vec3f vec2;
+        Vec3f multVec;
+        Vec3f focusPos;
 
-        vec1 = sMultVec;
-        Matrix_MultVec3f(&vec1, &vec2);
-        this->actor.focus.pos.x = vec2.x;
-        this->actor.focus.pos.y = vec2.y;
-        this->actor.focus.pos.z = vec2.z;
+        multVec = sMultVec;
+        Matrix_MultVec3f(&multVec, &focusPos);
+        this->actor.focus.pos.x = focusPos.x;
+        this->actor.focus.pos.y = focusPos.y;
+        this->actor.focus.pos.z = focusPos.z;
         this->actor.focus.rot.x = this->actor.world.rot.x;
         this->actor.focus.rot.y = this->actor.world.rot.y;
         this->actor.focus.rot.z = this->actor.world.rot.z;
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
index b4faf8d3f4..6968b6fb0d 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
@@ -37,7 +37,7 @@ typedef struct EnRu1 {
     /* 0x0286 */ s8 roomNum3;
     /* 0x0288 */ f32 unk_288;
     /* 0x028C */ BgBdanObjects* bigOctoPlatform;
-    /* 0x0290 */ s32 unk_290;
+    /* 0x0290 */ s32 preLimbDrawIndex;
     /* 0x0294 */ char unk_294[0x4];
     /* 0x0298 */ s32 unk_298;
     /* 0x029C */ char unk_29C[0x2];

From f73e56481782858b13a7122738ba47322a2b4e1e Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Fri, 6 Jun 2025 19:24:44 +0200
Subject: [PATCH 3/4] Add various undocumented resources in xmls 2 (#2594)

---
 assets/xml/objects/gameplay_field_keep.xml   | 17 ++++
 assets/xml/objects/object_am.xml             | 32 ++++++++
 assets/xml/objects/object_ani.xml            |  1 +
 assets/xml/objects/object_anubice.xml        | 33 ++++++++
 assets/xml/objects/object_bdan_objects.xml   |  2 +
 assets/xml/objects/object_blkobj.xml         | 24 ++++++
 assets/xml/objects/object_crow.xml           | 16 ++++
 assets/xml/objects/object_ddan_objects.xml   |  2 +
 assets/xml/objects/object_dekunuts.xml       | 34 ++++++++
 assets/xml/objects/object_demo_kekkai.xml    | 18 +++++
 assets/xml/objects/object_dnk.xml            | 26 +++++++
 assets/xml/objects/object_dns.xml            | 30 +++++++
 assets/xml/objects/object_dodongo.xml        | 43 ++++++++++
 assets/xml/objects/object_fd2.xml            | 82 ++++++++++++++++++++
 assets/xml/objects/object_firefly.xml        | 37 +++++++++
 assets/xml/objects/object_fw.xml             |  1 +
 assets/xml/objects/object_geldb.xml          | 60 ++++++++++++++
 assets/xml/objects/object_gj.xml             | 12 +++
 assets/xml/objects/object_gnd.xml            | 43 ++++++++++
 assets/xml/objects/object_gr.xml             | 44 +++++++++++
 assets/xml/objects/object_hakach_objects.xml |  1 +
 assets/xml/objects/object_hidan_objects.xml  | 20 +++++
 22 files changed, 578 insertions(+)

diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index 3c0f18d74e..c0a5b8e30e 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -58,5 +58,22 @@
         <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
         <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
         <Texture Name="gFieldKeepTex_00CB30" OutName="gFieldKeep_00CB30" Format="rgba16" Width="32" Height="32" Offset="0xCB30"/>
+
+        <DList Name="gameplay_field_keep_002530_DL" Offset="0x2530"/>
+        <DList Name="gameplay_field_keep_002630_DL" Offset="0x2630"/>
+        <Limb Name="gameplay_field_keep_003680_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_003680" Offset="0x3680"/>
+        <Limb Name="gameplay_field_keep_00368C_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_00368C" Offset="0x368C"/>
+        <Limb Name="gameplay_field_keep_003698_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_003698" Offset="0x3698"/>
+        <Limb Name="gameplay_field_keep_0036A4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0036A4" Offset="0x36A4"/>
+        <Limb Name="gameplay_field_keep_0036B0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0036B0" Offset="0x36B0"/>
+        <Limb Name="gameplay_field_keep_0036BC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0036BC" Offset="0x36BC"/>
+        <Limb Name="gameplay_field_keep_0036C8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0036C8" Offset="0x36C8"/>
+        <DList Name="gameplay_field_keep_0061F8_DL" Offset="0x61F8"/>
+        <DList Name="gameplay_field_keep_006458_DL" Offset="0x6458"/>
+        <Limb Name="gameplay_field_keep_0088A8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0088A8" Offset="0x88A8"/>
+        <Limb Name="gameplay_field_keep_0088B4_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0088B4" Offset="0x88B4"/>
+        <Limb Name="gameplay_field_keep_0088C0_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0088C0" Offset="0x88C0"/>
+        <Limb Name="gameplay_field_keep_0088CC_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0088CC" Offset="0x88CC"/>
+        <Limb Name="gameplay_field_keep_0088D8_Limb" LimbType="Standard" EnumName="LIMB_GAMEPLAY_FIELD_KEEP_0088D8" Offset="0x88D8"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_am.xml b/assets/xml/objects/object_am.xml
index c787a7b391..faf6c5576a 100644
--- a/assets/xml/objects/object_am.xml
+++ b/assets/xml/objects/object_am.xml
@@ -23,5 +23,37 @@
         <Array Name="object_am_Vtx_002440" Count="17" Offset="0x2440">
             <Vtx/>
         </Array>
+
+        <Blob Name="object_am_000010_Blob" Size="0x10" Offset="0x10"/>
+        <DList Name="object_am_0005D0_DL" Offset="0x5D0"/>
+        <DList Name="object_am_0016C8_DL" Offset="0x16C8"/>
+        <DList Name="object_am_002278_DL" Offset="0x2278"/>
+        <DList Name="object_am_002550_DL" Offset="0x2550"/>
+        <Texture Name="object_am_002638_Tex" Format="i4" Width="32" Height="32" Offset="0x2638"/>
+        <Texture Name="object_am_002838_Tex" Format="i4" Width="16" Height="32" Offset="0x2838"/>
+        <Texture Name="object_am_002938_Tex" Format="rgba16" Width="16" Height="32" Offset="0x2938"/>
+        <Texture Name="object_am_002D38_Tex" Format="i4" Width="16" Height="32" Offset="0x2D38"/>
+        <Texture Name="object_am_002E38_Tex" Format="i4" Width="32" Height="32" Offset="0x2E38"/>
+        <Texture Name="object_am_003038_Tex" Format="i4" Width="32" Height="32" Offset="0x3038"/>
+        <Texture Name="object_am_003238_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3238"/>
+        <Texture Name="object_am_003A38_Tex" Format="rgba16" Width="16" Height="16" Offset="0x3A38"/>
+        <Texture Name="object_am_003C38_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3C38"/>
+        <Texture Name="object_am_004438_Tex" Format="rgba16" Width="32" Height="32" Offset="0x4438"/>
+        <Texture Name="object_am_004C38_Tex" Format="rgba16" Width="32" Height="32" Offset="0x4C38"/>
+        <Texture Name="object_am_005438_Tex" Format="i4" Width="16" Height="8" Offset="0x5438"/>
+        <Texture Name="object_am_005478_Tex" Format="rgba16" Width="16" Height="32" Offset="0x5478"/>
+        <Limb Name="object_am_005878_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_005878" Offset="0x5878"/>
+        <Limb Name="object_am_005884_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_005884" Offset="0x5884"/>
+        <Limb Name="object_am_005890_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_005890" Offset="0x5890"/>
+        <Limb Name="object_am_00589C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_00589C" Offset="0x589C"/>
+        <Limb Name="object_am_0058A8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058A8" Offset="0x58A8"/>
+        <Limb Name="object_am_0058B4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058B4" Offset="0x58B4"/>
+        <Limb Name="object_am_0058C0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058C0" Offset="0x58C0"/>
+        <Limb Name="object_am_0058CC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058CC" Offset="0x58CC"/>
+        <Limb Name="object_am_0058D8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058D8" Offset="0x58D8"/>
+        <Limb Name="object_am_0058E4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058E4" Offset="0x58E4"/>
+        <Limb Name="object_am_0058F0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058F0" Offset="0x58F0"/>
+        <Limb Name="object_am_0058FC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_0058FC" Offset="0x58FC"/>
+        <Limb Name="object_am_005908_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_AM_005908" Offset="0x5908"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml
index f0b09bba59..da67fd71d8 100644
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -47,6 +47,7 @@
         <Texture Name="gRoofManThighGradientTex" OutName="roof_man_thigh_gradient" Format="ci8" Width="8" Height="8" Offset="0x00D48" TlutOffset="0x00108"/>
         <Texture Name="gRoofManSandalBuckleTex" OutName="roof_man_sandal_buckle" Format="ci8" Width="16" Height="16" Offset="0x00D88" TlutOffset="0x00108"/>
         <Texture Name="gRoofManTrouserPatternTex" OutName="roof_man_trouser_pattern" Format="rgba16" Width="16" Height="16" Offset="0x00E88"/>
+        <Texture Name="object_ani_0011D8_Tex" Format="ci8" Width="16" Height="16" Offset="0x11D8" TlutOffset="0x1088"/>
         <Texture Name="gRoofManSkinGradientTex" OutName="roof_man_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x012D8" TlutOffset="0x1088"/>
         <Texture Name="gRoofManEarTex" OutName="roof_man_ear" Format="ci8" Width="16" Height="16" Offset="0x01318" TlutOffset="0x1088"/>
         <Texture Name="gRoofManHairTex" OutName="roof_man_hair" Format="ci8" Width="16" Height="16" Offset="0x01418" TlutOffset="0x1088"/>
diff --git a/assets/xml/objects/object_anubice.xml b/assets/xml/objects/object_anubice.xml
index 7c3148d742..492a8e4235 100644
--- a/assets/xml/objects/object_anubice.xml
+++ b/assets/xml/objects/object_anubice.xml
@@ -51,5 +51,38 @@
         <Array Name="gAnubiceUnusedParticleModelVtx" Count="4" Offset="0x35D0">
             <Vtx/>
         </Array>
+
+        <Texture Name="object_anubice_000F90_Tex" Format="rgba16" Width="8" Height="16" Offset="0xF90"/>
+        <Texture Name="object_anubice_001090_Tex" Format="rgba16" Width="4" Height="16" Offset="0x1090"/>
+        <Texture Name="object_anubice_001110_Tex" Format="rgba16" Width="16" Height="32" Offset="0x1110"/>
+        <Texture Name="object_anubice_001510_Tex" Format="rgba16" Width="8" Height="8" Offset="0x1510"/>
+        <Texture Name="object_anubice_001590_Tex" Format="rgba16" Width="8" Height="8" Offset="0x1590"/>
+        <Texture Name="object_anubice_001610_Tex" Format="rgba16" Width="4" Height="16" Offset="0x1610"/>
+        <Texture Name="object_anubice_001690_Tex" Format="ia16" Width="32" Height="16" Offset="0x1690"/>
+        <Texture Name="object_anubice_001A90_Tex" Format="rgba16" Width="8" Height="8" Offset="0x1A90"/>
+        <DList Name="object_anubice_002CE0_DL" Offset="0x2CE0"/>
+        <DList Name="object_anubice_002E30_DL" Offset="0x2E30"/>
+        <DList Name="object_anubice_002EE0_DL" Offset="0x2EE0"/>
+        <DList Name="object_anubice_002F90_DL" Offset="0x2F90"/>
+        <DList Name="object_anubice_003040_DL" Offset="0x3040"/>
+        <DList Name="object_anubice_003108_DL" Offset="0x3108"/>
+        <DList Name="object_anubice_0031A0_DL" Offset="0x31A0"/>
+        <DList Name="object_anubice_003288_DL" Offset="0x3288"/>
+        <Texture Name="object_anubice_0036A0_Tex" Format="i4" Width="32" Height="32" Offset="0x36A0"/>
+        <Limb Name="object_anubice_0038A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038A0" Offset="0x38A0"/>
+        <Limb Name="object_anubice_0038AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038AC" Offset="0x38AC"/>
+        <Limb Name="object_anubice_0038B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038B8" Offset="0x38B8"/>
+        <Limb Name="object_anubice_0038C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038C4" Offset="0x38C4"/>
+        <Limb Name="object_anubice_0038D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038D0" Offset="0x38D0"/>
+        <Limb Name="object_anubice_0038DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038DC" Offset="0x38DC"/>
+        <Limb Name="object_anubice_0038E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038E8" Offset="0x38E8"/>
+        <Limb Name="object_anubice_0038F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_0038F4" Offset="0x38F4"/>
+        <Limb Name="object_anubice_003900_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_003900" Offset="0x3900"/>
+        <Limb Name="object_anubice_00390C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_00390C" Offset="0x390C"/>
+        <Limb Name="object_anubice_003918_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_003918" Offset="0x3918"/>
+        <Limb Name="object_anubice_003924_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_003924" Offset="0x3924"/>
+        <Limb Name="object_anubice_003930_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_003930" Offset="0x3930"/>
+        <Limb Name="object_anubice_00393C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_00393C" Offset="0x393C"/>
+        <Limb Name="object_anubice_003948_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ANUBICE_003948" Offset="0x3948"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bdan_objects.xml b/assets/xml/objects/object_bdan_objects.xml
index 36f6541f03..39c5ec55bc 100644
--- a/assets/xml/objects/object_bdan_objects.xml
+++ b/assets/xml/objects/object_bdan_objects.xml
@@ -33,7 +33,9 @@
         <Texture Name="gJabuObjects8TLUT" OutName="jabu_objects_8_tlut" Format="rgba16" Width="160" Height="1" Offset="0x2CA0"/>
         <Texture Name="gJabuObjects9TLUT" OutName="jabu_objects_9_tlut" Format="rgba16" Width="204" Height="1" Offset="0x3300"/>
         <Texture Name="gJabuObjects10TLUT" OutName="jabu_objects_10_tlut" Format="rgba16" Width="16" Height="16" Offset="0x39B0"/>
+        <Blob Name="object_bdan_objects_003BB0_Blob" Size="0x8" Offset="0x3BB0"/>
         <Texture Name="gJabuObjects11TLUT" OutName="jabu_objects_11_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6540"/>
+        <Blob Name="object_bdan_objects_006740_Blob" Size="0x8" Offset="0x6740"/>
 
         <!-- DLists -->
         <DList Name="gJabuDoorSection1DL" Offset="0x0590"/>
diff --git a/assets/xml/objects/object_blkobj.xml b/assets/xml/objects/object_blkobj.xml
index c8f3012bf4..a2f22813b9 100644
--- a/assets/xml/objects/object_blkobj.xml
+++ b/assets/xml/objects/object_blkobj.xml
@@ -21,5 +21,29 @@
             <Vtx/>
         </Array>
         <DList Name="gIllusionRoomTreeDL" Offset="0x7EB0"/>
+
+
+        <Texture Name="object_blkobj_008090_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8090"/>
+        <Texture Name="object_blkobj_008890_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8890"/>
+        <Texture Name="object_blkobj_009090_Tex" Format="rgba16" Width="32" Height="32" Offset="0x9090"/>
+        <Texture Name="object_blkobj_009890_Tex" Format="rgba16" Width="32" Height="32" Offset="0x9890"/>
+        <Texture Name="object_blkobj_00A090_Tex" Format="ia16" Width="32" Height="32" Offset="0xA090"/>
+        <Texture Name="object_blkobj_00A890_Tex" Format="rgba16" Width="32" Height="32" Offset="0xA890"/>
+        <Texture Name="object_blkobj_00B090_Tex" Format="rgba16" Width="32" Height="32" Offset="0xB090"/>
+        <Texture Name="object_blkobj_00B890_Tex" Format="rgba16" Width="32" Height="32" Offset="0xB890"/>
+        <Texture Name="object_blkobj_00C090_Tex" Format="rgba16" Width="32" Height="32" Offset="0xC090"/>
+        <Texture Name="object_blkobj_00C890_Tex" Format="rgba16" Width="32" Height="32" Offset="0xC890"/>
+        <Texture Name="object_blkobj_00D090_Tex" Format="rgba16" Width="32" Height="32" Offset="0xD090"/>
+        <Texture Name="object_blkobj_00D890_Tex" Format="rgba16" Width="32" Height="32" Offset="0xD890"/>
+        <Texture Name="object_blkobj_00E090_Tex" Format="rgba16" Width="32" Height="32" Offset="0xE090"/>
+        <Texture Name="object_blkobj_00E890_Tex" Format="rgba16" Width="32" Height="64" Offset="0xE890"/>
+        <Texture Name="object_blkobj_00F890_Tex" Format="rgba16" Width="32" Height="32" Offset="0xF890"/>
+        <Texture Name="object_blkobj_010090_Tex" Format="rgba16" Width="32" Height="32" Offset="0x10090"/>
+        <Texture Name="object_blkobj_010890_Tex" Format="rgba16" Width="32" Height="32" Offset="0x10890"/>
+        <Texture Name="object_blkobj_011090_Tex" Format="rgba16" Width="32" Height="32" Offset="0x11090"/>
+        <Texture Name="object_blkobj_011890_Tex" Format="rgba16" Width="32" Height="32" Offset="0x11890"/>
+        <Texture Name="object_blkobj_012090_Tex" Format="rgba16" Width="32" Height="32" Offset="0x12090"/>
+        <Texture Name="object_blkobj_012890_Tex" Format="rgba16" Width="32" Height="32" Offset="0x12890"/>
+        <Texture Name="object_blkobj_013090_Tex" Format="rgba16" Width="32" Height="32" Offset="0x13090"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml
index ee166346b3..61a77d122d 100644
--- a/assets/xml/objects/object_crow.xml
+++ b/assets/xml/objects/object_crow.xml
@@ -30,5 +30,21 @@
         <Array Name="object_crow_Vtx_000460" Count="3" Offset="0x460">
             <Vtx/>
         </Array>
+
+        <DList Name="object_crow_000490_DL" Offset="0x490"/>
+        <DList Name="object_crow_0005E0_DL" Offset="0x5E0"/>
+        <DList Name="object_crow_0006B0_DL" Offset="0x6B0"/>
+        <DList Name="object_crow_000770_DL" Offset="0x770"/>
+        <DList Name="object_crow_000840_DL" Offset="0x840"/>
+        <DList Name="object_crow_000900_DL" Offset="0x900"/>
+        <DList Name="object_crow_0009A0_DL" Offset="0x9A0"/>
+        <Limb Name="object_crow_001040_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_001040" Offset="0x1040"/>
+        <Limb Name="object_crow_00104C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_00104C" Offset="0x104C"/>
+        <Limb Name="object_crow_001058_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_001058" Offset="0x1058"/>
+        <Limb Name="object_crow_001064_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_001064" Offset="0x1064"/>
+        <Limb Name="object_crow_001070_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_001070" Offset="0x1070"/>
+        <Limb Name="object_crow_00107C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_00107C" Offset="0x107C"/>
+        <Limb Name="object_crow_001088_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_001088" Offset="0x1088"/>
+        <Limb Name="object_crow_001094_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_CROW_001094" Offset="0x1094"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ddan_objects.xml b/assets/xml/objects/object_ddan_objects.xml
index 6eeb481eb3..6f1f9d8549 100644
--- a/assets/xml/objects/object_ddan_objects.xml
+++ b/assets/xml/objects/object_ddan_objects.xml
@@ -15,7 +15,9 @@
         <!-- Palettes -->
         <Texture Name="gDodongo1TLUT" OutName="tlut_1" Format="rgba16" Width="160" Height="1" Offset="0x02D0"/>
         <Texture Name="gDodongo2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x1E10"/> <!-- Palette seems to be actually 258 colors -->
+        <Blob Name="object_ddan_objects_002010_Blob" Size="0x8" Offset="0x2010"/>
         <Texture Name="gDodongo3TLUT" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x3D10"/> <!-- Palette seems to be actually 258 colors -->
+        <Blob Name="object_ddan_objects_003F10_Blob" Size="0x8" Offset="0x3F10"/>
 
         <!-- Dodongo's Cavern DisplayLists -->
         <DList Name="gDodongoDoorDL" Offset="0xC0"/>
diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml
index 8f1303fadb..b5b4065983 100644
--- a/assets/xml/objects/object_dekunuts.xml
+++ b/assets/xml/objects/object_dekunuts.xml
@@ -63,5 +63,39 @@
         <Array Name="gDekuNutsFlowerVtx" Count="30" Offset="0x20B8">
             <Vtx/>
         </Array>
+
+        <DList Name="object_dekunuts_0018C0_DL" Offset="0x18C0"/>
+        <DList Name="object_dekunuts_0019F8_DL" Offset="0x19F8"/>
+        <DList Name="object_dekunuts_001AA8_DL" Offset="0x1AA8"/>
+        <DList Name="object_dekunuts_001B48_DL" Offset="0x1B48"/>
+        <DList Name="object_dekunuts_001BF0_DL" Offset="0x1BF0"/>
+        <DList Name="object_dekunuts_001D08_DL" Offset="0x1D08"/>
+        <DList Name="object_dekunuts_001DA8_DL" Offset="0x1DA8"/>
+        <DList Name="object_dekunuts_001E58_DL" Offset="0x1E58"/>
+        <DList Name="object_dekunuts_001F50_DL" Offset="0x1F50"/>
+        <Limb Name="object_dekunuts_0030E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0030E8" Offset="0x30E8"/>
+        <Limb Name="object_dekunuts_0030F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0030F4" Offset="0x30F4"/>
+        <Limb Name="object_dekunuts_003100_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003100" Offset="0x3100"/>
+        <Limb Name="object_dekunuts_00310C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_00310C" Offset="0x310C"/>
+        <Limb Name="object_dekunuts_003118_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003118" Offset="0x3118"/>
+        <Limb Name="object_dekunuts_003124_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003124" Offset="0x3124"/>
+        <Limb Name="object_dekunuts_003130_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003130" Offset="0x3130"/>
+        <Limb Name="object_dekunuts_00313C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_00313C" Offset="0x313C"/>
+        <Limb Name="object_dekunuts_003148_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003148" Offset="0x3148"/>
+        <Limb Name="object_dekunuts_003154_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003154" Offset="0x3154"/>
+        <Limb Name="object_dekunuts_003160_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003160" Offset="0x3160"/>
+        <Limb Name="object_dekunuts_00316C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_00316C" Offset="0x316C"/>
+        <Limb Name="object_dekunuts_003178_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003178" Offset="0x3178"/>
+        <Limb Name="object_dekunuts_003184_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003184" Offset="0x3184"/>
+        <Limb Name="object_dekunuts_003190_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_003190" Offset="0x3190"/>
+        <Limb Name="object_dekunuts_00319C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_00319C" Offset="0x319C"/>
+        <Limb Name="object_dekunuts_0031A8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031A8" Offset="0x31A8"/>
+        <Limb Name="object_dekunuts_0031B4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031B4" Offset="0x31B4"/>
+        <Limb Name="object_dekunuts_0031C0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031C0" Offset="0x31C0"/>
+        <Limb Name="object_dekunuts_0031CC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031CC" Offset="0x31CC"/>
+        <Limb Name="object_dekunuts_0031D8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031D8" Offset="0x31D8"/>
+        <Limb Name="object_dekunuts_0031E4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031E4" Offset="0x31E4"/>
+        <Limb Name="object_dekunuts_0031F0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031F0" Offset="0x31F0"/>
+        <Limb Name="object_dekunuts_0031FC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DEKUNUTS_0031FC" Offset="0x31FC"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_demo_kekkai.xml b/assets/xml/objects/object_demo_kekkai.xml
index 256a9fdebc..b35f9d0422 100644
--- a/assets/xml/objects/object_demo_kekkai.xml
+++ b/assets/xml/objects/object_demo_kekkai.xml
@@ -83,5 +83,23 @@
             <Vtx/>
         </Array>
         <DList Name="gGanonsCastleDoorDL" Offset="0x20D0"/>
+
+
+        <Texture Name="object_demo_kekkai_000000_Tex" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="object_demo_kekkai_000800_Tex" Format="i8" Width="32" Height="64" Offset="0x800"/>
+        <Texture Name="object_demo_kekkai_001000_Tex" Format="rgba16" Width="32" Height="64" Offset="0x1000"/>
+        <Texture Name="object_demo_kekkai_002450_Tex" Format="rgba16" Width="32" Height="64" Offset="0x2450"/>
+        <Texture Name="object_demo_kekkai_0036A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x36A0"/>
+        <Texture Name="object_demo_kekkai_003EA0_Tex" Format="i8" Width="32" Height="32" Offset="0x3EA0"/>
+        <Texture Name="object_demo_kekkai_004AC0_Tex" Format="i8" Width="32" Height="32" Offset="0x4AC0"/>
+        <Texture Name="object_demo_kekkai_006140_Tex" Format="ia16" Width="8" Height="128" Offset="0x6140"/>
+        <Texture Name="object_demo_kekkai_006940_Tex" Format="ia8" Width="64" Height="64" Offset="0x6940"/>
+        <Texture Name="object_demo_kekkai_007DB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x7DB0"/>
+        <Texture Name="object_demo_kekkai_0089D0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x89D0"/>
+        <Texture Name="object_demo_kekkai_0092D0_Tex" Format="rgba16" Width="32" Height="64" Offset="0x92D0"/>
+        <Texture Name="object_demo_kekkai_00A440_Tex" Format="rgba16" Width="64" Height="32" Offset="0xA440"/>
+        <Texture Name="object_demo_kekkai_00B540_Tex" Format="ia16" Width="32" Height="32" Offset="0xB540"/>
+        <Texture Name="object_demo_kekkai_00C0B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0xC0B0"/>
+        <Texture Name="object_demo_kekkai_00C8B0_Tex" Format="rgba16" Width="32" Height="64" Offset="0xC8B0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index 00b5da9157..91eee5052c 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -64,5 +64,31 @@
 
         <!-- Forest Stage scrub animation -->
         <Animation Name="gDntStageWaitAnim" Offset="0x2CB8"/>
+
+        <DList Name="object_dnk_001150_DL" Offset="0x1150"/>
+        <DList Name="object_dnk_0011E0_DL" Offset="0x11E0"/>
+        <DList Name="object_dnk_001298_DL" Offset="0x1298"/>
+        <DList Name="object_dnk_0013B0_DL" Offset="0x13B0"/>
+        <DList Name="object_dnk_0014B0_DL" Offset="0x14B0"/>
+        <DList Name="object_dnk_001548_DL" Offset="0x1548"/>
+        <DList Name="object_dnk_0015E0_DL" Offset="0x15E0"/>
+        <DList Name="object_dnk_001670_DL" Offset="0x1670"/>
+        <DList Name="object_dnk_001700_DL" Offset="0x1700"/>
+        <DList Name="object_dnk_0017B0_DL" Offset="0x17B0"/>
+        <Texture Name="object_dnk_001BD0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x1BD0"/>
+        <Texture Name="object_dnk_0023D0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x23D0"/>
+        <Texture Name="object_dnk_002650_Tex" Format="rgba16" Width="8" Height="8" Offset="0x2650"/>
+        <Texture Name="object_dnk_0026D0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x26D0"/>
+        <Texture Name="object_dnk_002850_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2850"/>
+        <Limb Name="object_dnk_002A50_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A50" Offset="0x2A50"/>
+        <Limb Name="object_dnk_002A5C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A5C" Offset="0x2A5C"/>
+        <Limb Name="object_dnk_002A68_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A68" Offset="0x2A68"/>
+        <Limb Name="object_dnk_002A74_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A74" Offset="0x2A74"/>
+        <Limb Name="object_dnk_002A80_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A80" Offset="0x2A80"/>
+        <Limb Name="object_dnk_002A8C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A8C" Offset="0x2A8C"/>
+        <Limb Name="object_dnk_002A98_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002A98" Offset="0x2A98"/>
+        <Limb Name="object_dnk_002AA4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002AA4" Offset="0x2AA4"/>
+        <Limb Name="object_dnk_002AB0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002AB0" Offset="0x2AB0"/>
+        <Limb Name="object_dnk_002ABC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNK_002ABC" Offset="0x2ABC"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml
index 5989afbc5f..f934b6b125 100644
--- a/assets/xml/objects/object_dns.xml
+++ b/assets/xml/objects/object_dns.xml
@@ -74,5 +74,35 @@
         <Animation Name="gDntJijiDanceAnim" Offset="0x82C"/>
         <Animation Name="gDntJijiUnkAnim" Offset="0xF98"/> <!-- This animation seems corrupted-->
         <Animation Name="gDntJijiWaitAnim" Offset="0x364C"/>
+
+        <DList Name="object_dns_001900_DL" Offset="0x1900"/>
+        <DList Name="object_dns_001990_DL" Offset="0x1990"/>
+        <DList Name="object_dns_001A40_DL" Offset="0x1A40"/>
+        <DList Name="object_dns_001AF0_DL" Offset="0x1AF0"/>
+        <DList Name="object_dns_001BA8_DL" Offset="0x1BA8"/>
+        <DList Name="object_dns_001CC0_DL" Offset="0x1CC0"/>
+        <DList Name="object_dns_001DC0_DL" Offset="0x1DC0"/>
+        <DList Name="object_dns_001E58_DL" Offset="0x1E58"/>
+        <DList Name="object_dns_001EE8_DL" Offset="0x1EE8"/>
+        <DList Name="object_dns_001F78_DL" Offset="0x1F78"/>
+        <DList Name="object_dns_002008_DL" Offset="0x2008"/>
+        <DList Name="object_dns_0020A0_DL" Offset="0x20A0"/>
+        <Texture Name="object_dns_0024A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x24A0"/>
+        <Texture Name="object_dns_002CA0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2CA0"/>
+        <Texture Name="object_dns_002F20_Tex" Format="rgba16" Width="8" Height="8" Offset="0x2F20"/>
+        <Texture Name="object_dns_002FA0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x2FA0"/>
+        <Texture Name="object_dns_003120_Tex" Format="rgba16" Width="16" Height="16" Offset="0x3120"/>
+        <Limb Name="object_dns_003320_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003320" Offset="0x3320"/>
+        <Limb Name="object_dns_00332C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_00332C" Offset="0x332C"/>
+        <Limb Name="object_dns_003338_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003338" Offset="0x3338"/>
+        <Limb Name="object_dns_003344_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003344" Offset="0x3344"/>
+        <Limb Name="object_dns_003350_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003350" Offset="0x3350"/>
+        <Limb Name="object_dns_00335C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_00335C" Offset="0x335C"/>
+        <Limb Name="object_dns_003368_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003368" Offset="0x3368"/>
+        <Limb Name="object_dns_003374_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003374" Offset="0x3374"/>
+        <Limb Name="object_dns_003380_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003380" Offset="0x3380"/>
+        <Limb Name="object_dns_00338C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_00338C" Offset="0x338C"/>
+        <Limb Name="object_dns_003398_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_003398" Offset="0x3398"/>
+        <Limb Name="object_dns_0033A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DNS_0033A4" Offset="0x33A4"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml
index e7b00e7d31..e01b49133e 100644
--- a/assets/xml/objects/object_dodongo.xml
+++ b/assets/xml/objects/object_dodongo.xml
@@ -78,5 +78,48 @@
         <Array Name="gDodongoFireVtx" Count="4" Offset="0x9900">
             <Vtx/>
         </Array>
+
+        <DList Name="object_dodongo_006640_DL" Offset="0x6640"/>
+        <DList Name="object_dodongo_006750_DL" Offset="0x6750"/>
+        <DList Name="object_dodongo_006860_DL" Offset="0x6860"/>
+        <DList Name="object_dodongo_006960_DL" Offset="0x6960"/>
+        <DList Name="object_dodongo_006AA0_DL" Offset="0x6AA0"/>
+        <DList Name="object_dodongo_006BA8_DL" Offset="0x6BA8"/>
+        <DList Name="object_dodongo_006CA8_DL" Offset="0x6CA8"/>
+        <DList Name="object_dodongo_006D88_DL" Offset="0x6D88"/>
+        <DList Name="object_dodongo_006FD8_DL" Offset="0x6FD8"/>
+        <DList Name="object_dodongo_007198_DL" Offset="0x7198"/>
+        <DList Name="object_dodongo_007298_DL" Offset="0x7298"/>
+        <DList Name="object_dodongo_0073A8_DL" Offset="0x73A8"/>
+        <Limb Name="object_dodongo_008138_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008138" Offset="0x8138"/>
+        <Limb Name="object_dodongo_008144_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008144" Offset="0x8144"/>
+        <Limb Name="object_dodongo_008150_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008150" Offset="0x8150"/>
+        <Limb Name="object_dodongo_00815C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_00815C" Offset="0x815C"/>
+        <Limb Name="object_dodongo_008168_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008168" Offset="0x8168"/>
+        <Limb Name="object_dodongo_008174_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008174" Offset="0x8174"/>
+        <Limb Name="object_dodongo_008180_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008180" Offset="0x8180"/>
+        <Limb Name="object_dodongo_00818C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_00818C" Offset="0x818C"/>
+        <Limb Name="object_dodongo_008198_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008198" Offset="0x8198"/>
+        <Limb Name="object_dodongo_0081A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081A4" Offset="0x81A4"/>
+        <Limb Name="object_dodongo_0081B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081B0" Offset="0x81B0"/>
+        <Limb Name="object_dodongo_0081BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081BC" Offset="0x81BC"/>
+        <Limb Name="object_dodongo_0081C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081C8" Offset="0x81C8"/>
+        <Limb Name="object_dodongo_0081D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081D4" Offset="0x81D4"/>
+        <Limb Name="object_dodongo_0081E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081E0" Offset="0x81E0"/>
+        <Limb Name="object_dodongo_0081EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081EC" Offset="0x81EC"/>
+        <Limb Name="object_dodongo_0081F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_0081F8" Offset="0x81F8"/>
+        <Limb Name="object_dodongo_008204_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008204" Offset="0x8204"/>
+        <Limb Name="object_dodongo_008210_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008210" Offset="0x8210"/>
+        <Limb Name="object_dodongo_00821C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_00821C" Offset="0x821C"/>
+        <Limb Name="object_dodongo_008228_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008228" Offset="0x8228"/>
+        <Limb Name="object_dodongo_008234_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008234" Offset="0x8234"/>
+        <Limb Name="object_dodongo_008240_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008240" Offset="0x8240"/>
+        <Limb Name="object_dodongo_00824C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_00824C" Offset="0x824C"/>
+        <Limb Name="object_dodongo_008258_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008258" Offset="0x8258"/>
+        <Limb Name="object_dodongo_008264_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008264" Offset="0x8264"/>
+        <Limb Name="object_dodongo_008270_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008270" Offset="0x8270"/>
+        <Limb Name="object_dodongo_00827C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_00827C" Offset="0x827C"/>
+        <Limb Name="object_dodongo_008288_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008288" Offset="0x8288"/>
+        <Limb Name="object_dodongo_008294_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_DODONGO_008294" Offset="0x8294"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml
index e6c4d6cce8..f37d53fd83 100644
--- a/assets/xml/objects/object_fd2.xml
+++ b/assets/xml/objects/object_fd2.xml
@@ -151,5 +151,87 @@
         <Array Name="object_fd2_Vtx_00FDE0" Count="25" Offset="0xFDE0">
             <Vtx/>
         </Array>
+
+        <DList Name="object_fd2_001010_DL" Offset="0x1010"/>
+        <DList Name="object_fd2_001308_DL" Offset="0x1308"/>
+        <DList Name="object_fd2_0013E0_DL" Offset="0x13E0"/>
+        <DList Name="object_fd2_0015B8_DL" Offset="0x15B8"/>
+        <DList Name="object_fd2_001680_DL" Offset="0x1680"/>
+        <DList Name="object_fd2_001748_DL" Offset="0x1748"/>
+        <DList Name="object_fd2_0018D8_DL" Offset="0x18D8"/>
+        <DList Name="object_fd2_0019D0_DL" Offset="0x19D0"/>
+        <DList Name="object_fd2_001AB0_DL" Offset="0x1AB0"/>
+        <DList Name="object_fd2_001BF0_DL" Offset="0x1BF0"/>
+        <DList Name="object_fd2_001D30_DL" Offset="0x1D30"/>
+        <DList Name="object_fd2_001E70_DL" Offset="0x1E70"/>
+        <DList Name="object_fd2_001F70_DL" Offset="0x1F70"/>
+        <DList Name="object_fd2_002068_DL" Offset="0x2068"/>
+        <DList Name="object_fd2_002148_DL" Offset="0x2148"/>
+        <DList Name="object_fd2_002288_DL" Offset="0x2288"/>
+        <DList Name="object_fd2_0023C8_DL" Offset="0x23C8"/>
+        <Texture Name="object_fd2_003308_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3308"/>
+        <Texture Name="object_fd2_003B08_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3B08"/>
+        <Texture Name="object_fd2_004308_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4308"/>
+        <Texture Name="object_fd2_004508_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4508"/>
+        <Texture Name="object_fd2_004708_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4708"/>
+        <Texture Name="object_fd2_004908_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4908"/>
+        <Texture Name="object_fd2_004BE8_Tex" Format="i8" Width="16" Height="16" Offset="0x4BE8"/>
+        <Texture Name="object_fd2_004FA0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x4FA0"/>
+        <Texture Name="object_fd2_0051A0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x51A0"/>
+        <Texture Name="object_fd2_0053A0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x53A0"/>
+        <DList Name="object_fd2_00FF70_DL" Offset="0xFF70"/>
+        <DList Name="object_fd2_010070_DL" Offset="0x10070"/>
+        <DList Name="object_fd2_0101D0_DL" Offset="0x101D0"/>
+        <DList Name="object_fd2_010330_DL" Offset="0x10330"/>
+        <DList Name="object_fd2_010490_DL" Offset="0x10490"/>
+        <DList Name="object_fd2_0105F8_DL" Offset="0x105F8"/>
+        <DList Name="object_fd2_010758_DL" Offset="0x10758"/>
+        <DList Name="object_fd2_0108B0_DL" Offset="0x108B0"/>
+        <DList Name="object_fd2_010A10_DL" Offset="0x10A10"/>
+        <DList Name="object_fd2_010BC8_DL" Offset="0x10BC8"/>
+        <DList Name="object_fd2_010D40_DL" Offset="0x10D40"/>
+        <DList Name="object_fd2_010E98_DL" Offset="0x10E98"/>
+        <DList Name="object_fd2_010FF8_DL" Offset="0x10FF8"/>
+        <DList Name="object_fd2_011160_DL" Offset="0x11160"/>
+        <DList Name="object_fd2_0112C0_DL" Offset="0x112C0"/>
+        <DList Name="object_fd2_011410_DL" Offset="0x11410"/>
+        <DList Name="object_fd2_011560_DL" Offset="0x11560"/>
+        <DList Name="object_fd2_0116B8_DL" Offset="0x116B8"/>
+        <Limb Name="object_fd2_011838_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011838" Offset="0x11838"/>
+        <Limb Name="object_fd2_011844_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011844" Offset="0x11844"/>
+        <Limb Name="object_fd2_011850_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011850" Offset="0x11850"/>
+        <Limb Name="object_fd2_01185C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_01185C" Offset="0x1185C"/>
+        <Limb Name="object_fd2_011868_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011868" Offset="0x11868"/>
+        <Limb Name="object_fd2_011874_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011874" Offset="0x11874"/>
+        <Limb Name="object_fd2_011880_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011880" Offset="0x11880"/>
+        <Limb Name="object_fd2_01188C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_01188C" Offset="0x1188C"/>
+        <Limb Name="object_fd2_011898_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011898" Offset="0x11898"/>
+        <Limb Name="object_fd2_0118A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118A4" Offset="0x118A4"/>
+        <Limb Name="object_fd2_0118B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118B0" Offset="0x118B0"/>
+        <Limb Name="object_fd2_0118BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118BC" Offset="0x118BC"/>
+        <Limb Name="object_fd2_0118C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118C8" Offset="0x118C8"/>
+        <Limb Name="object_fd2_0118D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118D4" Offset="0x118D4"/>
+        <Limb Name="object_fd2_0118E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118E0" Offset="0x118E0"/>
+        <Limb Name="object_fd2_0118EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118EC" Offset="0x118EC"/>
+        <Limb Name="object_fd2_0118F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0118F8" Offset="0x118F8"/>
+        <Limb Name="object_fd2_011904_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011904" Offset="0x11904"/>
+        <Limb Name="object_fd2_011910_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011910" Offset="0x11910"/>
+        <Limb Name="object_fd2_01191C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_01191C" Offset="0x1191C"/>
+        <Limb Name="object_fd2_011928_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011928" Offset="0x11928"/>
+        <Limb Name="object_fd2_011934_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011934" Offset="0x11934"/>
+        <Limb Name="object_fd2_011940_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011940" Offset="0x11940"/>
+        <Limb Name="object_fd2_01194C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_01194C" Offset="0x1194C"/>
+        <Limb Name="object_fd2_011958_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011958" Offset="0x11958"/>
+        <Limb Name="object_fd2_011964_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011964" Offset="0x11964"/>
+        <Limb Name="object_fd2_011970_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011970" Offset="0x11970"/>
+        <Limb Name="object_fd2_01197C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_01197C" Offset="0x1197C"/>
+        <Limb Name="object_fd2_011988_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011988" Offset="0x11988"/>
+        <Limb Name="object_fd2_011994_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_011994" Offset="0x11994"/>
+        <Limb Name="object_fd2_0119A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0119A0" Offset="0x119A0"/>
+        <Limb Name="object_fd2_0119AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0119AC" Offset="0x119AC"/>
+        <Limb Name="object_fd2_0119B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0119B8" Offset="0x119B8"/>
+        <Limb Name="object_fd2_0119C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0119C4" Offset="0x119C4"/>
+        <Limb Name="object_fd2_0119D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0119D0" Offset="0x119D0"/>
+        <Limb Name="object_fd2_0119DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FD2_0119DC" Offset="0x119DC"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml
index e7de1cfc44..48424e7af0 100644
--- a/assets/xml/objects/object_firefly.xml
+++ b/assets/xml/objects/object_firefly.xml
@@ -51,5 +51,42 @@
         <Array Name="gKeeseEyesVtx" Count="6" Offset="0xCD0">
             <Vtx/>
         </Array>
+        <DList Name="object_firefly_000D30_DL" Offset="0xD30"/>
+        <DList Name="object_firefly_000F40_DL" Offset="0xF40"/>
+        <DList Name="object_firefly_001038_DL" Offset="0x1038"/>
+        <DList Name="object_firefly_001100_DL" Offset="0x1100"/>
+        <DList Name="object_firefly_0011C8_DL" Offset="0x11C8"/>
+        <DList Name="object_firefly_001290_DL" Offset="0x1290"/>
+        <DList Name="object_firefly_001358_DL" Offset="0x1358"/>
+        <DList Name="object_firefly_001420_DL" Offset="0x1420"/>
+        <DList Name="object_firefly_0014E8_DL" Offset="0x14E8"/>
+        <DList Name="object_firefly_0015B0_DL" Offset="0x15B0"/>
+        <Limb Name="object_firefly_001708_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001708" Offset="0x1708"/>
+        <Limb Name="object_firefly_001714_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001714" Offset="0x1714"/>
+        <Limb Name="object_firefly_001720_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001720" Offset="0x1720"/>
+        <Limb Name="object_firefly_00172C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00172C" Offset="0x172C"/>
+        <Limb Name="object_firefly_001738_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001738" Offset="0x1738"/>
+        <Limb Name="object_firefly_001744_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001744" Offset="0x1744"/>
+        <Limb Name="object_firefly_001750_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001750" Offset="0x1750"/>
+        <Limb Name="object_firefly_00175C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00175C" Offset="0x175C"/>
+        <Limb Name="object_firefly_001768_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001768" Offset="0x1768"/>
+        <Limb Name="object_firefly_001774_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001774" Offset="0x1774"/>
+        <Limb Name="object_firefly_001780_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001780" Offset="0x1780"/>
+        <Limb Name="object_firefly_00178C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00178C" Offset="0x178C"/>
+        <Limb Name="object_firefly_001798_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001798" Offset="0x1798"/>
+        <Limb Name="object_firefly_0017A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017A4" Offset="0x17A4"/>
+        <Limb Name="object_firefly_0017B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017B0" Offset="0x17B0"/>
+        <Limb Name="object_firefly_0017BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017BC" Offset="0x17BC"/>
+        <Limb Name="object_firefly_0017C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017C8" Offset="0x17C8"/>
+        <Limb Name="object_firefly_0017D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017D4" Offset="0x17D4"/>
+        <Limb Name="object_firefly_0017E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017E0" Offset="0x17E0"/>
+        <Limb Name="object_firefly_0017EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017EC" Offset="0x17EC"/>
+        <Limb Name="object_firefly_0017F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017F8" Offset="0x17F8"/>
+        <Limb Name="object_firefly_001804_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001804" Offset="0x1804"/>
+        <Limb Name="object_firefly_001810_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001810" Offset="0x1810"/>
+        <Limb Name="object_firefly_00181C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00181C" Offset="0x181C"/>
+        <Limb Name="object_firefly_001828_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001828" Offset="0x1828"/>
+        <Limb Name="object_firefly_001834_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001834" Offset="0x1834"/>
+        <Limb Name="object_firefly_001840_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001840" Offset="0x1840"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fw.xml b/assets/xml/objects/object_fw.xml
index d18ac114a1..2ecd79e695 100644
--- a/assets/xml/objects/object_fw.xml
+++ b/assets/xml/objects/object_fw.xml
@@ -91,6 +91,7 @@
         <Texture Name="gFlareDancerFuseTex" OutName="fuse" Format="rgba16" Width="16" Height="32" Offset="0x20F0"/>
         <Texture Name="gFlareDancerSwordHiltTex" OutName="sword_hilt" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
         <Texture Name="gFlareDancerCoreBodyTex" OutName="core_body" Format="rgba16" Width="16" Height="32" Offset="0x26F0"/>
+        <Texture Name="object_fw_007A90_Tex" Format="i8" Width="16" Height="16" Offset="0x7A90"/>
 
         <!-- Flare Dancer Animations -->
         <Animation Name="gFlareDancerCastingFireAnim" Offset="0x10B4"/>
diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml
index 4d23d80e8c..c0ac526558 100644
--- a/assets/xml/objects/object_geldb.xml
+++ b/assets/xml/objects/object_geldb.xml
@@ -83,5 +83,65 @@
         <Array Name="object_geldb_Vtx_0080C8" Count="232" Offset="0x80C8">
             <Vtx/>
         </Array>
+
+        <Texture Name="object_geldb_002500_TLUT" Format="rgba16" Width="104" Height="1" Offset="0x2500"/>
+        <Blob Name="object_geldb_0025D0_Blob" Size="0x130" Offset="0x25D0"/>
+        <Texture Name="object_geldb_002700_Tex" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x2500"/>
+        <Texture Name="object_geldb_002740_Tex" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x2500"/>
+        <Texture Name="object_geldb_002780_Tex" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x2500"/>
+        <Texture Name="object_geldb_002880_Tex" Format="i8" Width="16" Height="16" Offset="0x2880"/>
+        <Texture Name="object_geldb_002980_Tex" Format="ci8" Width="16" Height="16" Offset="0x2980" TlutOffset="0x2500"/>
+        <Texture Name="object_geldb_002A80_Tex" Format="i8" Width="16" Height="16" Offset="0x2A80"/>
+        <Texture Name="object_geldb_002B80_Tex" Format="i8" Width="8" Height="16" Offset="0x2B80"/>
+        <DList Name="object_geldb_0048E0_DL" Offset="0x48E0"/>
+        <DList Name="object_geldb_004D60_DL" Offset="0x4D60"/>
+        <DList Name="object_geldb_004E98_DL" Offset="0x4E98"/>
+        <DList Name="object_geldb_0050C0_DL" Offset="0x50C0"/>
+        <DList Name="object_geldb_0051F8_DL" Offset="0x51F8"/>
+        <DList Name="object_geldb_005420_DL" Offset="0x5420"/>
+        <DList Name="object_geldb_005640_DL" Offset="0x5640"/>
+        <DList Name="object_geldb_005740_DL" Offset="0x5740"/>
+        <DList Name="object_geldb_0059B0_DL" Offset="0x59B0"/>
+        <DList Name="object_geldb_005AB0_DL" Offset="0x5AB0"/>
+        <Texture Name="object_geldb_005F68_Tex" Format="ci8" Width="8" Height="16" Offset="0x5F68" TlutOffset="0x5D30"/>
+        <Texture Name="object_geldb_0063E8_Tex" Format="i8" Width="16" Height="16" Offset="0x63E8"/>
+        <Texture Name="object_geldb_0064E8_Tex" Format="ci8" Width="8" Height="16" Offset="0x64E8" TlutOffset="0x5D30"/>
+        <Texture Name="object_geldb_006568_Tex" Format="ci8" Width="8" Height="8" Offset="0x6568" TlutOffset="0x5D30"/>
+        <Texture Name="object_geldb_0069A8_Tex" Format="i8" Width="8" Height="16" Offset="0x69A8"/>
+        <Texture Name="object_geldb_006A28_Tex" Format="ci8" Width="16" Height="16" Offset="0x6A28" TlutOffset="0x5D30"/>
+        <Texture Name="object_geldb_006B28_Tex" Format="ci8" Width="16" Height="16" Offset="0x6B28" TlutOffset="0x5D30"/>
+        <Texture Name="object_geldb_006C28_Tex" Format="ci8" Width="16" Height="16" Offset="0x6C28" TlutOffset="0x5D30"/>
+        <DList Name="object_geldb_008F48_DL" Offset="0x8F48"/>
+        <DList Name="object_geldb_009108_DL" Offset="0x9108"/>
+        <DList Name="object_geldb_0092C8_DL" Offset="0x92C8"/>
+        <DList Name="object_geldb_009460_DL" Offset="0x9460"/>
+        <DList Name="object_geldb_009638_DL" Offset="0x9638"/>
+        <DList Name="object_geldb_0097D0_DL" Offset="0x97D0"/>
+        <DList Name="object_geldb_0099A8_DL" Offset="0x99A8"/>
+        <DList Name="object_geldb_009A60_DL" Offset="0x9A60"/>
+        <DList Name="object_geldb_009B50_DL" Offset="0x9B50"/>
+        <Limb Name="object_geldb_00A2E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A2E8" Offset="0xA2E8"/>
+        <Limb Name="object_geldb_00A2F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A2F4" Offset="0xA2F4"/>
+        <Limb Name="object_geldb_00A300_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A300" Offset="0xA300"/>
+        <Limb Name="object_geldb_00A30C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A30C" Offset="0xA30C"/>
+        <Limb Name="object_geldb_00A318_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A318" Offset="0xA318"/>
+        <Limb Name="object_geldb_00A324_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A324" Offset="0xA324"/>
+        <Limb Name="object_geldb_00A330_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A330" Offset="0xA330"/>
+        <Limb Name="object_geldb_00A33C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A33C" Offset="0xA33C"/>
+        <Limb Name="object_geldb_00A348_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A348" Offset="0xA348"/>
+        <Limb Name="object_geldb_00A354_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A354" Offset="0xA354"/>
+        <Limb Name="object_geldb_00A360_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A360" Offset="0xA360"/>
+        <Limb Name="object_geldb_00A36C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A36C" Offset="0xA36C"/>
+        <Limb Name="object_geldb_00A378_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A378" Offset="0xA378"/>
+        <Limb Name="object_geldb_00A384_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A384" Offset="0xA384"/>
+        <Limb Name="object_geldb_00A390_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A390" Offset="0xA390"/>
+        <Limb Name="object_geldb_00A39C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A39C" Offset="0xA39C"/>
+        <Limb Name="object_geldb_00A3A8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3A8" Offset="0xA3A8"/>
+        <Limb Name="object_geldb_00A3B4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3B4" Offset="0xA3B4"/>
+        <Limb Name="object_geldb_00A3C0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3C0" Offset="0xA3C0"/>
+        <Limb Name="object_geldb_00A3CC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3CC" Offset="0xA3CC"/>
+        <Limb Name="object_geldb_00A3D8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3D8" Offset="0xA3D8"/>
+        <Limb Name="object_geldb_00A3E4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3E4" Offset="0xA3E4"/>
+        <Limb Name="object_geldb_00A3F0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GELDB_00A3F0" Offset="0xA3F0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gj.xml b/assets/xml/objects/object_gj.xml
index bb67f1262d..64f1f5e119 100644
--- a/assets/xml/objects/object_gj.xml
+++ b/assets/xml/objects/object_gj.xml
@@ -55,5 +55,17 @@
         <Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
         <Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgba16" Width="32" Height="32" Offset="0x9B20"/>
         <Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
+
+
+        <Texture Name="object_gj_003B20_Tex" Format="ia8" Width="16" Height="16" Offset="0x3B20"/>
+        <Texture Name="object_gj_003C20_Tex" Format="i4" Width="16" Height="32" Offset="0x3C20"/>
+        <Texture Name="object_gj_003D20_Tex" Format="rgba16" Width="16" Height="16" Offset="0x3D20"/>
+        <Texture Name="object_gj_003F20_Tex" Format="i8" Width="64" Height="64" Offset="0x3F20"/>
+        <Texture Name="object_gj_004F20_Tex" Format="i8" Width="64" Height="64" Offset="0x4F20"/>
+        <Texture Name="object_gj_005F20_Tex" Format="i8" Width="64" Height="64" Offset="0x5F20"/>
+        <Texture Name="object_gj_006F20_Tex" Format="i4" Width="32" Height="64" Offset="0x6F20"/>
+        <Texture Name="object_gj_007320_Tex" Format="i8" Width="64" Height="16" Offset="0x7320"/>
+        <Texture Name="object_gj_007720_Tex" Format="ia8" Width="32" Height="32" Offset="0x7720"/>
+        <Texture Name="object_gj_007B20_Tex" Format="i8" Width="128" Height="32" Offset="0x7B20"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gnd.xml b/assets/xml/objects/object_gnd.xml
index e8b6937a8d..1c5533a3d1 100644
--- a/assets/xml/objects/object_gnd.xml
+++ b/assets/xml/objects/object_gnd.xml
@@ -137,5 +137,48 @@
         <Array Name="gPhantomGanonBarsVtx" Count="12" Offset="0x129F0">
             <Vtx/>
         </Array>
+
+        <DList Name="object_gnd_0080F8_DL" Offset="0x80F8"/>
+        <DList Name="object_gnd_0086F0_DL" Offset="0x86F0"/>
+        <DList Name="object_gnd_008918_DL" Offset="0x8918"/>
+        <DList Name="object_gnd_0089F0_DL" Offset="0x89F0"/>
+        <DList Name="object_gnd_008BE0_DL" Offset="0x8BE0"/>
+        <DList Name="object_gnd_009038_DL" Offset="0x9038"/>
+        <DList Name="object_gnd_009298_DL" Offset="0x9298"/>
+        <DList Name="object_gnd_009460_DL" Offset="0x9460"/>
+        <DList Name="object_gnd_009520_DL" Offset="0x9520"/>
+        <DList Name="object_gnd_009650_DL" Offset="0x9650"/>
+        <DList Name="object_gnd_0097B8_DL" Offset="0x97B8"/>
+        <DList Name="object_gnd_0099A8_DL" Offset="0x99A8"/>
+        <DList Name="object_gnd_009A80_DL" Offset="0x9A80"/>
+        <DList Name="object_gnd_009CA8_DL" Offset="0x9CA8"/>
+        <DList Name="object_gnd_009D68_DL" Offset="0x9D68"/>
+        <DList Name="object_gnd_009ED0_DL" Offset="0x9ED0"/>
+        <Limb Name="object_gnd_00C580_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C580" Offset="0xC580"/>
+        <Limb Name="object_gnd_00C58C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C58C" Offset="0xC58C"/>
+        <Limb Name="object_gnd_00C598_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C598" Offset="0xC598"/>
+        <Limb Name="object_gnd_00C5A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5A4" Offset="0xC5A4"/>
+        <Limb Name="object_gnd_00C5B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5B0" Offset="0xC5B0"/>
+        <Limb Name="object_gnd_00C5BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5BC" Offset="0xC5BC"/>
+        <Limb Name="object_gnd_00C5C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5C8" Offset="0xC5C8"/>
+        <Limb Name="object_gnd_00C5D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5D4" Offset="0xC5D4"/>
+        <Limb Name="object_gnd_00C5E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5E0" Offset="0xC5E0"/>
+        <Limb Name="object_gnd_00C5EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5EC" Offset="0xC5EC"/>
+        <Limb Name="object_gnd_00C5F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C5F8" Offset="0xC5F8"/>
+        <Limb Name="object_gnd_00C604_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C604" Offset="0xC604"/>
+        <Limb Name="object_gnd_00C610_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C610" Offset="0xC610"/>
+        <Limb Name="object_gnd_00C61C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C61C" Offset="0xC61C"/>
+        <Limb Name="object_gnd_00C628_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C628" Offset="0xC628"/>
+        <Limb Name="object_gnd_00C634_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C634" Offset="0xC634"/>
+        <Limb Name="object_gnd_00C640_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C640" Offset="0xC640"/>
+        <Limb Name="object_gnd_00C64C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C64C" Offset="0xC64C"/>
+        <Limb Name="object_gnd_00C658_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C658" Offset="0xC658"/>
+        <Limb Name="object_gnd_00C664_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C664" Offset="0xC664"/>
+        <Limb Name="object_gnd_00C670_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C670" Offset="0xC670"/>
+        <Limb Name="object_gnd_00C67C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C67C" Offset="0xC67C"/>
+        <Limb Name="object_gnd_00C688_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C688" Offset="0xC688"/>
+        <Limb Name="object_gnd_00C694_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C694" Offset="0xC694"/>
+        <Limb Name="object_gnd_00C6A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GND_00C6A0" Offset="0xC6A0"/>
+        <Texture Name="object_gnd_012B50_Tex" Format="rgba16" Width="16" Height="32" Offset="0x12B50"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_gr.xml b/assets/xml/objects/object_gr.xml
index 103d4412e9..f825a9f0af 100644
--- a/assets/xml/objects/object_gr.xml
+++ b/assets/xml/objects/object_gr.xml
@@ -12,5 +12,49 @@
         <Texture Name="gNiwGirlDress3Tex" OutName="dress_3" Format="rgba16" Width="32" Height="32" Offset="0x8FF8"/>
         <Texture Name="gNiwGirlDress4Tex" OutName="dress_4" Format="rgba16" Width="32" Height="32" Offset="0x67F8"/>
         <Texture Name="gNiwGirlDress5Tex" OutName="dress_5" Format="rgba16" Width="32" Height="32" Offset="0x87F8"/>
+
+        <DList Name="object_gr_0021C0_DL" Offset="0x21C0"/>
+        <DList Name="object_gr_0022E0_DL" Offset="0x22E0"/>
+        <DList Name="object_gr_002400_DL" Offset="0x2400"/>
+        <DList Name="object_gr_002C18_DL" Offset="0x2C18"/>
+        <DList Name="object_gr_002EA8_DL" Offset="0x2EA8"/>
+        <DList Name="object_gr_003068_DL" Offset="0x3068"/>
+        <DList Name="object_gr_003270_DL" Offset="0x3270"/>
+        <DList Name="object_gr_003430_DL" Offset="0x3430"/>
+        <DList Name="object_gr_003638_DL" Offset="0x3638"/>
+        <DList Name="object_gr_0037C8_DL" Offset="0x37C8"/>
+        <DList Name="object_gr_0039A0_DL" Offset="0x39A0"/>
+        <DList Name="object_gr_003AC0_DL" Offset="0x3AC0"/>
+        <DList Name="object_gr_003BA0_DL" Offset="0x3BA0"/>
+        <DList Name="object_gr_003D78_DL" Offset="0x3D78"/>
+        <DList Name="object_gr_003E98_DL" Offset="0x3E98"/>
+        <Texture Name="object_gr_003F78_TLUT" Format="rgba16" Width="144" Height="1" Offset="0x3F78"/>
+        <Blob Name="object_gr_004098_Blob" Size="0xE0" Offset="0x4098"/>
+        <Texture Name="object_gr_005D78_Tex" Format="ci8" Width="16" Height="16" Offset="0x5D78" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_005E78_Tex" Format="ci8" Width="8" Height="8" Offset="0x5E78" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_005EB8_Tex" Format="ci8" Width="8" Height="8" Offset="0x5EB8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_005EF8_Tex" Format="ci8" Width="16" Height="16" Offset="0x5EF8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_0077F8_Tex" Format="ci8" Width="32" Height="32" Offset="0x77F8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_007BF8_Tex" Format="ci8" Width="32" Height="32" Offset="0x7BF8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_007FF8_Tex" Format="ci8" Width="32" Height="32" Offset="0x7FF8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_0083F8_Tex" Format="ci8" Width="32" Height="32" Offset="0x83F8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_0097F8_Tex" Format="ci8" Width="4" Height="4" Offset="0x97F8" TlutOffset="0x3F78"/>
+        <Texture Name="object_gr_009808_Tex" Format="ci8" Width="8" Height="8" Offset="0x9808" TlutOffset="0x3F78"/>
+        <Limb Name="object_gr_009848_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_009848" Offset="0x9848"/>
+        <Limb Name="object_gr_009854_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_009854" Offset="0x9854"/>
+        <Limb Name="object_gr_009860_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_009860" Offset="0x9860"/>
+        <Limb Name="object_gr_00986C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_00986C" Offset="0x986C"/>
+        <Limb Name="object_gr_009878_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_009878" Offset="0x9878"/>
+        <Limb Name="object_gr_009884_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_009884" Offset="0x9884"/>
+        <Limb Name="object_gr_009890_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_009890" Offset="0x9890"/>
+        <Limb Name="object_gr_00989C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_00989C" Offset="0x989C"/>
+        <Limb Name="object_gr_0098A8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098A8" Offset="0x98A8"/>
+        <Limb Name="object_gr_0098B4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098B4" Offset="0x98B4"/>
+        <Limb Name="object_gr_0098C0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098C0" Offset="0x98C0"/>
+        <Limb Name="object_gr_0098CC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098CC" Offset="0x98CC"/>
+        <Limb Name="object_gr_0098D8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098D8" Offset="0x98D8"/>
+        <Limb Name="object_gr_0098E4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098E4" Offset="0x98E4"/>
+        <Limb Name="object_gr_0098F0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098F0" Offset="0x98F0"/>
+        <Limb Name="object_gr_0098FC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_GR_0098FC" Offset="0x98FC"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_hakach_objects.xml b/assets/xml/objects/object_hakach_objects.xml
index a3eb7795ba..d7c61f321b 100644
--- a/assets/xml/objects/object_hakach_objects.xml
+++ b/assets/xml/objects/object_hakach_objects.xml
@@ -51,5 +51,6 @@
         <Texture Name="gBotwTex_0050F0" Format="rgba16" Width="32" Height="32" Offset="0x50F0"/>
         <Texture Name="gBotwTex_0058F0" Format="rgba16" Width="32" Height="32" Offset="0x58F0"/>
         <Texture Name="gBotwTex_0060F0" Format="i4" Width="32" Height="32" Offset="0x60F0"/>
+        <Texture Name="object_hakach_objects_0062F0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x62F0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_hidan_objects.xml b/assets/xml/objects/object_hidan_objects.xml
index 857cd80ed6..65f74b9f68 100644
--- a/assets/xml/objects/object_hidan_objects.xml
+++ b/assets/xml/objects/object_hidan_objects.xml
@@ -175,5 +175,25 @@
         <DList Name="gFireTempleDoorBackDL" Offset="0x11F20"/>
 
         <Texture Name="gFireTempleDoorKillerTex" OutName="fire_temple_door_killer" Format="rgba16" Width="32" Height="64" Offset="0xE5A0"/>
+        <Texture Name="object_hidan_objects_000000_TLUT" Format="rgba16" Width="16" Height="1" Offset="0x0"/>
+        <Texture Name="object_hidan_objects_000020_TLUT" Format="rgba16" Width="16" Height="1" Offset="0x20"/>
+        <Texture Name="object_hidan_objects_000040_Tex" Format="ci4" Width="32" Height="32" Offset="0x40" TlutOffset="0x0"/>
+        <Texture Name="object_hidan_objects_000240_Tex" Format="rgba16" Width="32" Height="32" Offset="0x240"/>
+        <Texture Name="object_hidan_objects_000A40_Tex" Format="rgba16" Width="32" Height="64" Offset="0xA40"/>
+        <Texture Name="object_hidan_objects_001A40_Tex" Format="rgba16" Width="32" Height="64" Offset="0x1A40"/>
+        <Texture Name="object_hidan_objects_002A40_Tex" Format="rgba16" Width="32" Height="64" Offset="0x2A40"/>
+        <Texture Name="object_hidan_objects_003A40_Tex" Format="rgba16" Width="32" Height="32" Offset="0x3A40"/>
+        <Texture Name="object_hidan_objects_004240_Tex" Format="rgba16" Width="16" Height="64" Offset="0x4240"/>
+        <Texture Name="object_hidan_objects_004A40_Tex" Format="rgba16" Width="32" Height="32" Offset="0x4A40"/>
+        <Texture Name="object_hidan_objects_005240_Tex" Format="ci4" Width="32" Height="64" Offset="0x5240" TlutOffset="0x0"/>
+        <Texture Name="object_hidan_objects_005640_Tex" Format="ci4" Width="32" Height="64" Offset="0x5640" TlutOffset="0x0"/>
+        <Texture Name="object_hidan_objects_005A40_Tex" Format="ci4" Width="64" Height="32" Offset="0x5A40" TlutOffset="0x20"/>
+        <Texture Name="object_hidan_objects_005E40_Tex" Format="rgba16" Width="32" Height="32" Offset="0x5E40"/>
+        <Texture Name="object_hidan_objects_006640_Tex" Format="ci4" Width="32" Height="64" Offset="0x6640" TlutOffset="0x0"/>
+        <Texture Name="object_hidan_objects_006A40_Tex" Format="ci4" Width="32" Height="32" Offset="0x6A40" TlutOffset="0x0"/>
+        <Texture Name="object_hidan_objects_006C40_Tex" Format="ci4" Width="32" Height="32" Offset="0x6C40" TlutOffset="0x0"/>
+        <Texture Name="object_hidan_objects_006E40_Tex" Format="rgba16" Width="32" Height="32" Offset="0x6E40"/>
+        <Texture Name="object_hidan_objects_00FB20_Tex" Format="rgba16" Width="32" Height="64" Offset="0xFB20"/>
+        <Texture Name="object_hidan_objects_010D90_Tex" Format="rgba16" Width="32" Height="64" Offset="0x10D90"/>
     </File>
 </Root>

From e1fb3a974fc49ca9e20a629004dc5a3f09e5728c Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Fri, 6 Jun 2025 20:44:13 +0200
Subject: [PATCH 4/4] Add various undocumented resources in xmls 3 (#2595)

---
 assets/xml/objects/object_hintnuts.xml        | 25 +++++++
 assets/xml/objects/object_ik.xml              | 65 +++++++++++++++++
 assets/xml/objects/object_jj.xml              | 43 ++++++------
 assets/xml/objects/object_jya_obj.xml         |  8 +++
 .../xml/objects/object_masterkokirihead.xml   |  2 +
 assets/xml/objects/object_mb.xml              | 70 +++++++++++++++++++
 assets/xml/objects/object_mizu_objects.xml    | 15 ++++
 assets/xml/objects/object_mm.xml              | 40 +++++++++++
 assets/xml/objects/object_oF1d_map.xml        | 50 +++++++++++++
 assets/xml/objects/object_okuta.xml           | 54 ++++++++++++++
 assets/xml/objects/object_owl.xml             | 38 ++++++++++
 assets/xml/objects/object_ru2.xml             |  2 +
 assets/xml/objects/object_sa.xml              |  1 +
 assets/xml/objects/object_skj.xml             | 11 +++
 assets/xml/objects/object_spot01_matoya.xml   |  1 +
 assets/xml/objects/object_spot01_matoyab.xml  |  1 +
 assets/xml/objects/object_spot09_obj.xml      | 21 ++++++
 assets/xml/objects/object_torch2.xml          | 41 +++++++++++
 assets/xml/objects/object_wallmaster.xml      | 40 +++++++++++
 assets/xml/objects/object_ydan_objects.xml    |  3 +
 assets/xml/objects/object_zl1.xml             |  1 +
 assets/xml/objects/object_zl2.xml             | 59 ++++++++++++++++
 assets/xml/objects/object_zl4.xml             | 63 +++++++++++++++++
 23 files changed, 632 insertions(+), 22 deletions(-)

diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml
index d3595d85e8..fe02e8adbe 100644
--- a/assets/xml/objects/object_hintnuts.xml
+++ b/assets/xml/objects/object_hintnuts.xml
@@ -19,5 +19,30 @@
 
         <!-- Deku Scrub Deku Nut (used by Nutsball) -->
         <DList Name="gHintNutsNutDL" Offset="0x12F0"/>
+
+        <DList Name="object_hintnuts_000B30_DL" Offset="0xB30"/>
+        <DList Name="object_hintnuts_000C68_DL" Offset="0xC68"/>
+        <DList Name="object_hintnuts_000D10_DL" Offset="0xD10"/>
+        <DList Name="object_hintnuts_000E28_DL" Offset="0xE28"/>
+        <DList Name="object_hintnuts_000EC8_DL" Offset="0xEC8"/>
+        <DList Name="object_hintnuts_000F78_DL" Offset="0xF78"/>
+        <DList Name="object_hintnuts_001028_DL" Offset="0x1028"/>
+        <DList Name="object_hintnuts_0010C8_DL" Offset="0x10C8"/>
+        <DList Name="object_hintnuts_001208_DL" Offset="0x1208"/>
+        <Texture Name="object_hintnuts_0015A8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x15A8"/>
+        <Texture Name="object_hintnuts_001DA8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x1DA8"/>
+        <Texture Name="object_hintnuts_001FA8_Tex" Format="rgba16" Width="8" Height="8" Offset="0x1FA8"/>
+        <Texture Name="object_hintnuts_002028_Tex" Format="rgba16" Width="8" Height="8" Offset="0x2028"/>
+        <Texture Name="object_hintnuts_0020A8_Tex" Format="rgba16" Width="8" Height="8" Offset="0x20A8"/>
+        <Texture Name="object_hintnuts_002128_Tex" Format="rgba16" Width="16" Height="16" Offset="0x2128"/>
+        <Limb Name="object_hintnuts_002328_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002328" Offset="0x2328"/>
+        <Limb Name="object_hintnuts_002334_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002334" Offset="0x2334"/>
+        <Limb Name="object_hintnuts_002340_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002340" Offset="0x2340"/>
+        <Limb Name="object_hintnuts_00234C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_00234C" Offset="0x234C"/>
+        <Limb Name="object_hintnuts_002358_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002358" Offset="0x2358"/>
+        <Limb Name="object_hintnuts_002364_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002364" Offset="0x2364"/>
+        <Limb Name="object_hintnuts_002370_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002370" Offset="0x2370"/>
+        <Limb Name="object_hintnuts_00237C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_00237C" Offset="0x237C"/>
+        <Limb Name="object_hintnuts_002388_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_HINTNUTS_002388" Offset="0x2388"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml
index 50f47e9d7c..0d056681ab 100644
--- a/assets/xml/objects/object_ik.xml
+++ b/assets/xml/objects/object_ik.xml
@@ -100,5 +100,70 @@
         <Texture Name="object_ik_Tex_01DBA8" OutName="tex_01DBA8" Format="ia16" Width="16" Height="16" Offset="0x1DBA8"/>
         <Texture Name="gIronKnuckleHair3Tex" OutName="iron_knuckle_hair_3_tex" Format="ci8" Width="16" Height="16" Offset="0x1DDA8" TlutOffset="0x1D9A8"/>
         <Texture Name="gIronKnuckleNabooruChestJewelTex" OutName="iron_knuckle_nabooru_chest_jewel_tex" Format="ci8" Width="16" Height="16" Offset="0x1DEA8" TlutOffset="0x1D9A8"/>
+        <Limb Name="object_ik_000370_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_000370" Offset="0x370"/>
+        <Limb Name="object_ik_000650_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_000650" Offset="0x650"/>
+        <Limb Name="object_ik_0008F0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0008F0" Offset="0x8F0"/>
+        <Limb Name="object_ik_000C80_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_000C80" Offset="0xC80"/>
+        <Limb Name="object_ik_000F20_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_000F20" Offset="0xF20"/>
+        <Limb Name="object_ik_01DFA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFA8" Offset="0x1DFA8"/>
+        <Limb Name="object_ik_01DFB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFB4" Offset="0x1DFB4"/>
+        <Limb Name="object_ik_01DFC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFC0" Offset="0x1DFC0"/>
+        <Limb Name="object_ik_01DFCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFCC" Offset="0x1DFCC"/>
+        <Limb Name="object_ik_01DFD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFD8" Offset="0x1DFD8"/>
+        <Limb Name="object_ik_01DFE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFE4" Offset="0x1DFE4"/>
+        <Limb Name="object_ik_01DFF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFF0" Offset="0x1DFF0"/>
+        <Limb Name="object_ik_01DFFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01DFFC" Offset="0x1DFFC"/>
+        <Limb Name="object_ik_01E008_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E008" Offset="0x1E008"/>
+        <Limb Name="object_ik_01E014_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E014" Offset="0x1E014"/>
+        <Limb Name="object_ik_01E020_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E020" Offset="0x1E020"/>
+        <Limb Name="object_ik_01E02C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E02C" Offset="0x1E02C"/>
+        <Limb Name="object_ik_01E038_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E038" Offset="0x1E038"/>
+        <Limb Name="object_ik_01E044_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E044" Offset="0x1E044"/>
+        <Limb Name="object_ik_01E050_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E050" Offset="0x1E050"/>
+        <Limb Name="object_ik_01E05C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E05C" Offset="0x1E05C"/>
+        <Limb Name="object_ik_01E068_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E068" Offset="0x1E068"/>
+        <Limb Name="object_ik_01E074_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E074" Offset="0x1E074"/>
+        <Limb Name="object_ik_01E080_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E080" Offset="0x1E080"/>
+        <Limb Name="object_ik_01E08C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E08C" Offset="0x1E08C"/>
+        <Limb Name="object_ik_01E098_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E098" Offset="0x1E098"/>
+        <Limb Name="object_ik_01E0A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0A4" Offset="0x1E0A4"/>
+        <Limb Name="object_ik_01E0B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0B0" Offset="0x1E0B0"/>
+        <Limb Name="object_ik_01E0BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0BC" Offset="0x1E0BC"/>
+        <Limb Name="object_ik_01E0C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0C8" Offset="0x1E0C8"/>
+        <Limb Name="object_ik_01E0D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0D4" Offset="0x1E0D4"/>
+        <Limb Name="object_ik_01E0E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0E0" Offset="0x1E0E0"/>
+        <Limb Name="object_ik_01E0EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0EC" Offset="0x1E0EC"/>
+        <Limb Name="object_ik_01E0F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01E0F8" Offset="0x1E0F8"/>
+        <Limb Name="object_ik_01EB30_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01EB30" Offset="0x1EB30"/>
+        <Limb Name="object_ik_01EE50_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_01EE50" Offset="0x1EE50"/>
+        <Limb Name="object_ik_0203F0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0203F0" Offset="0x203F0"/>
+        <Limb Name="object_ik_0203FC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0203FC" Offset="0x203FC"/>
+        <Limb Name="object_ik_020408_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020408" Offset="0x20408"/>
+        <Limb Name="object_ik_020414_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020414" Offset="0x20414"/>
+        <Limb Name="object_ik_020420_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020420" Offset="0x20420"/>
+        <Limb Name="object_ik_02042C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_02042C" Offset="0x2042C"/>
+        <Limb Name="object_ik_020438_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020438" Offset="0x20438"/>
+        <Limb Name="object_ik_020444_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020444" Offset="0x20444"/>
+        <Limb Name="object_ik_020450_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020450" Offset="0x20450"/>
+        <Limb Name="object_ik_02045C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_02045C" Offset="0x2045C"/>
+        <Limb Name="object_ik_020468_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020468" Offset="0x20468"/>
+        <Limb Name="object_ik_020474_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020474" Offset="0x20474"/>
+        <Limb Name="object_ik_020480_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020480" Offset="0x20480"/>
+        <Limb Name="object_ik_02048C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_02048C" Offset="0x2048C"/>
+        <Limb Name="object_ik_020498_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020498" Offset="0x20498"/>
+        <Limb Name="object_ik_0204A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204A4" Offset="0x204A4"/>
+        <Limb Name="object_ik_0204B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204B0" Offset="0x204B0"/>
+        <Limb Name="object_ik_0204BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204BC" Offset="0x204BC"/>
+        <Limb Name="object_ik_0204C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204C8" Offset="0x204C8"/>
+        <Limb Name="object_ik_0204D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204D4" Offset="0x204D4"/>
+        <Limb Name="object_ik_0204E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204E0" Offset="0x204E0"/>
+        <Limb Name="object_ik_0204EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204EC" Offset="0x204EC"/>
+        <Limb Name="object_ik_0204F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_0204F8" Offset="0x204F8"/>
+        <Limb Name="object_ik_020504_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020504" Offset="0x20504"/>
+        <Limb Name="object_ik_020510_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020510" Offset="0x20510"/>
+        <Limb Name="object_ik_02051C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_02051C" Offset="0x2051C"/>
+        <Limb Name="object_ik_020528_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020528" Offset="0x20528"/>
+        <Limb Name="object_ik_020534_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020534" Offset="0x20534"/>
+        <Limb Name="object_ik_020540_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_IK_020540" Offset="0x20540"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_jj.xml b/assets/xml/objects/object_jj.xml
index dcbdd4ff8f..76162935c6 100644
--- a/assets/xml/objects/object_jj.xml
+++ b/assets/xml/objects/object_jj.xml
@@ -61,28 +61,27 @@
         <DList Name="gJabuJabuFlukeDL" Offset="0x44A0"/>
 
         <!-- Jabu Jabu limbs -->
-        <!-- Only limbs with attached dLists are included for now; others are indicated by spaces -->
-
-
-
-        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" Offset="0xB87C"/><!-- Limb 4 -->
-
-        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" Offset="0xB894"/><!-- Limb 6 -->
-
-        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" Offset="0xB8AC"/><!-- Limb 8 -->
-        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" Offset="0xB8B8"/><!-- Limb 9 -->
-        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" Offset="0xB8C4"/><!-- Limb 10 -->
-
-        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" Offset="0xB8DC"/><!-- Limb 12 -->
-
-        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" Offset="0xB8F4"/><!-- Limb 14 -->
-
-        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" Offset="0xB90C"/><!-- Limb 16 -->
-
-        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" Offset="0xB924"/><!-- Limb 18 -->
-        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" Offset="0xB930"/><!-- Limb 19 -->
-
-        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" Offset="0xB948"/><!-- Limb 21 -->
+        <Limb Name="object_jj_00B858_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B858" Offset="0xB858"/>
+        <Limb Name="object_jj_00B864_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B864" Offset="0xB864"/>
+        <Limb Name="object_jj_00B870_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B870" Offset="0xB870"/>
+        <Limb Name="gJabuJabuBodyLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B87C" Offset="0xB87C"/>
+        <Limb Name="object_jj_00B888_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B888" Offset="0xB888"/>
+        <Limb Name="gJabuJabuLeftUpperFlipperLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B894" Offset="0xB894"/>
+        <Limb Name="object_jj_00B8A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8A0" Offset="0xB8A0"/>
+        <Limb Name="gJabuJabuLeftMidFlipperLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8AC" Offset="0xB8AC"/>
+        <Limb Name="gJabuJabuLeftLowerFlipperLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8B8" Offset="0xB8B8"/>
+        <Limb Name="gJabuJabuHeadLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8C4" Offset="0xB8C4"/>
+        <Limb Name="object_jj_00B8D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8D0" Offset="0xB8D0"/>
+        <Limb Name="gJabuJabuLeftFrillLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8DC" Offset="0xB8DC"/>
+        <Limb Name="object_jj_00B8E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8E8" Offset="0xB8E8"/>
+        <Limb Name="gJabuJabuRightFrillLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B8F4" Offset="0xB8F4"/>
+        <Limb Name="object_jj_00B900_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B900" Offset="0xB900"/>
+        <Limb Name="gJabuJabuRightUpperFlipperLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B90C" Offset="0xB90C"/>
+        <Limb Name="object_jj_00B918_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B918" Offset="0xB918"/>
+        <Limb Name="gJabuJabuRightMidFlipperLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B924" Offset="0xB924"/>
+        <Limb Name="gJabuJabuRightLowerFlipperLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B930" Offset="0xB930"/>
+        <Limb Name="object_jj_00B93C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B93C" Offset="0xB93C"/>
+        <Limb Name="gJabuJabuFlukeLimb" LimbType="Standard" EnumName="LIMB_OBJECT_JJ_00B948" Offset="0xB948"/>
 
         <!-- Jabu Jabu Limb textures -->
         <Texture Name="gJabuJabuFrillTex" OutName="jabu_jabu_frill" Format="rgba16" Width="32" Height="32" Offset="0x5B58"/>
diff --git a/assets/xml/objects/object_jya_obj.xml b/assets/xml/objects/object_jya_obj.xml
index 50c2700db1..07dcd31f7b 100644
--- a/assets/xml/objects/object_jya_obj.xml
+++ b/assets/xml/objects/object_jya_obj.xml
@@ -76,5 +76,13 @@
         <Texture Name="gMegamiLeftCrumble5Tex" OutName="megami_left_crumble_5" Format="ci4" Width="64" Height="64" Offset="0x0500" TlutOffset="0x4E0"/>
         <DList Name="gZurerukabeDL" Offset="0x12340"/>
         <Collision Name="gZurerukabeCol" Offset="0x12508"/>
+
+        <Texture Name="object_jya_obj_00B4B8_Tex" Format="ci8" Width="32" Height="32" Offset="0xB4B8" TlutOffset="0xAC70"/>
+        <Texture Name="object_jya_obj_011A60_TLUT" Format="rgba16" Width="16" Height="1" Offset="0x11A60"/>
+        <Texture Name="object_jya_obj_011A80_Tex" Format="ci4" Width="64" Height="64" Offset="0x11A80" TlutOffset="0x11A60"/>
+        <Texture Name="object_jya_obj_016140_Tex" Format="rgba16" Width="64" Height="32" Offset="0x16140"/>
+        <Texture Name="object_jya_obj_017140_Tex" Format="rgba16" Width="32" Height="16" Offset="0x17140"/>
+        <Texture Name="object_jya_obj_01B340_Tex" Format="ia8" Width="32" Height="32" Offset="0x1B340"/>
+        <Texture Name="object_jya_obj_01B740_Tex" Format="rgba16" Width="16" Height="16" Offset="0x1B740"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_masterkokirihead.xml b/assets/xml/objects/object_masterkokirihead.xml
index 1a35b675cf..0062871c05 100644
--- a/assets/xml/objects/object_masterkokirihead.xml
+++ b/assets/xml/objects/object_masterkokirihead.xml
@@ -6,6 +6,8 @@
         <DList Name="gKokiriShopkeeperHeadDL" Offset="0x2820"/>
         <Texture Name="gKokiriShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="248" Height="1" Offset="0x0"/>
         <Texture Name="gKokiriShopkeeperEyeHalfTex" OutName="eye_half" Format="rgba16" Width="32" Height="32" Offset="0x1F0"/>
+        <Texture Name="object_masterkokirihead_0009F0_Tex" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x0"/>
+        <Texture Name="object_masterkokirihead_000A30_Tex" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x0"/>
         <Texture Name="gKokiriShopkeeperEyeOpenTex" OutName="eye_open" Format="rgba16" Width="32" Height="32" Offset="0xB30"/>
         <Texture Name="gKokiriShopkeeperHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x0"/>
         <Texture Name="gKokiriShopkeeperNoseTex" OutName="nose" Format="ci8" Width="8" Height="8" Offset="0x1430" TlutOffset="0x0"/>
diff --git a/assets/xml/objects/object_mb.xml b/assets/xml/objects/object_mb.xml
index a8471429db..115d2c82d9 100644
--- a/assets/xml/objects/object_mb.xml
+++ b/assets/xml/objects/object_mb.xml
@@ -55,5 +55,75 @@
         <DList Name="gEnMbDL_013818" Offset="0x13818"/>
         <DList Name="gEnMbDL_013A30" Offset="0x13A30"/>
         <DList Name="gEnMbDL_013DF0" Offset="0x13DF0"/>
+
+        <DList Name="object_mb_007908_DL" Offset="0x7908"/>
+        <Texture Name="object_mb_008128_Tex" Format="rgba16" Width="16" Height="16" Offset="0x8128"/>
+        <Texture Name="object_mb_008328_Tex" Format="rgba16" Width="8" Height="32" Offset="0x8328"/>
+        <Texture Name="object_mb_008928_Tex" Format="rgba16" Width="8" Height="16" Offset="0x8928"/>
+        <Texture Name="object_mb_008A28_Tex" Format="rgba16" Width="4" Height="4" Offset="0x8A28"/>
+        <Texture Name="object_mb_008A48_Tex" Format="rgba16" Width="8" Height="24" Offset="0x8A48"/>
+        <Texture Name="object_mb_008BC8_Tex" Format="rgba16" Width="4" Height="16" Offset="0x8BC8"/>
+        <Texture Name="object_mb_008C48_Tex" Format="rgba16" Width="4" Height="8" Offset="0x8C48"/>
+        <Texture Name="object_mb_008C88_Tex" Format="rgba16" Width="8" Height="16" Offset="0x8C88"/>
+        <Limb Name="object_mb_008D88_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008D88" Offset="0x8D88"/>
+        <Limb Name="object_mb_008D94_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008D94" Offset="0x8D94"/>
+        <Limb Name="object_mb_008DA0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DA0" Offset="0x8DA0"/>
+        <Limb Name="object_mb_008DAC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DAC" Offset="0x8DAC"/>
+        <Limb Name="object_mb_008DB8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DB8" Offset="0x8DB8"/>
+        <Limb Name="object_mb_008DC4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DC4" Offset="0x8DC4"/>
+        <Limb Name="object_mb_008DD0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DD0" Offset="0x8DD0"/>
+        <Limb Name="object_mb_008DDC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DDC" Offset="0x8DDC"/>
+        <Limb Name="object_mb_008DE8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DE8" Offset="0x8DE8"/>
+        <Limb Name="object_mb_008DF4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008DF4" Offset="0x8DF4"/>
+        <Limb Name="object_mb_008E00_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E00" Offset="0x8E00"/>
+        <Limb Name="object_mb_008E0C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E0C" Offset="0x8E0C"/>
+        <Limb Name="object_mb_008E18_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E18" Offset="0x8E18"/>
+        <Limb Name="object_mb_008E24_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E24" Offset="0x8E24"/>
+        <Limb Name="object_mb_008E30_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E30" Offset="0x8E30"/>
+        <Limb Name="object_mb_008E3C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E3C" Offset="0x8E3C"/>
+        <Limb Name="object_mb_008E48_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E48" Offset="0x8E48"/>
+        <Limb Name="object_mb_008E54_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E54" Offset="0x8E54"/>
+        <Limb Name="object_mb_008E60_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E60" Offset="0x8E60"/>
+        <Limb Name="object_mb_008E6C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E6C" Offset="0x8E6C"/>
+        <Limb Name="object_mb_008E78_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E78" Offset="0x8E78"/>
+        <Limb Name="object_mb_008E84_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E84" Offset="0x8E84"/>
+        <Limb Name="object_mb_008E90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E90" Offset="0x8E90"/>
+        <Limb Name="object_mb_008E9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008E9C" Offset="0x8E9C"/>
+        <Limb Name="object_mb_008EA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008EA8" Offset="0x8EA8"/>
+        <Limb Name="object_mb_008EB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008EB4" Offset="0x8EB4"/>
+        <Limb Name="object_mb_008EC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_008EC0" Offset="0x8EC0"/>
+        <Texture Name="object_mb_00EC00_Tex" Format="rgba16" Width="16" Height="16" Offset="0xEC00"/>
+        <Texture Name="object_mb_00EE00_Tex" Format="rgba16" Width="8" Height="16" Offset="0xEE00"/>
+        <Texture Name="object_mb_00EF00_Tex" Format="rgba16" Width="8" Height="16" Offset="0xEF00"/>
+        <Texture Name="object_mb_00F000_Tex" Format="rgba16" Width="16" Height="16" Offset="0xF000"/>
+        <Texture Name="object_mb_00F200_Tex" Format="rgba16" Width="4" Height="16" Offset="0xF200"/>
+        <Texture Name="object_mb_00F280_Tex" Format="rgba16" Width="4" Height="16" Offset="0xF280"/>
+        <Limb Name="object_mb_013FE0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_013FE0" Offset="0x13FE0"/>
+        <Limb Name="object_mb_013FEC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_013FEC" Offset="0x13FEC"/>
+        <Limb Name="object_mb_013FF8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_013FF8" Offset="0x13FF8"/>
+        <Limb Name="object_mb_014004_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014004" Offset="0x14004"/>
+        <Limb Name="object_mb_014010_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014010" Offset="0x14010"/>
+        <Limb Name="object_mb_01401C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_01401C" Offset="0x1401C"/>
+        <Limb Name="object_mb_014028_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014028" Offset="0x14028"/>
+        <Limb Name="object_mb_014034_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014034" Offset="0x14034"/>
+        <Limb Name="object_mb_014040_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014040" Offset="0x14040"/>
+        <Limb Name="object_mb_01404C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_01404C" Offset="0x1404C"/>
+        <Limb Name="object_mb_014058_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014058" Offset="0x14058"/>
+        <Limb Name="object_mb_014064_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014064" Offset="0x14064"/>
+        <Limb Name="object_mb_014070_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014070" Offset="0x14070"/>
+        <Limb Name="object_mb_01407C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_01407C" Offset="0x1407C"/>
+        <Limb Name="object_mb_014088_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014088" Offset="0x14088"/>
+        <Limb Name="object_mb_014094_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014094" Offset="0x14094"/>
+        <Limb Name="object_mb_0140A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140A0" Offset="0x140A0"/>
+        <Limb Name="object_mb_0140AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140AC" Offset="0x140AC"/>
+        <Limb Name="object_mb_0140B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140B8" Offset="0x140B8"/>
+        <Limb Name="object_mb_0140C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140C4" Offset="0x140C4"/>
+        <Limb Name="object_mb_0140D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140D0" Offset="0x140D0"/>
+        <Limb Name="object_mb_0140DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140DC" Offset="0x140DC"/>
+        <Limb Name="object_mb_0140E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140E8" Offset="0x140E8"/>
+        <Limb Name="object_mb_0140F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_0140F4" Offset="0x140F4"/>
+        <Limb Name="object_mb_014100_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014100" Offset="0x14100"/>
+        <Limb Name="object_mb_01410C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_01410C" Offset="0x1410C"/>
+        <Limb Name="object_mb_014118_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MB_014118" Offset="0x14118"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml
index 5882b20501..e6bafbc67f 100644
--- a/assets/xml/objects/object_mizu_objects.xml
+++ b/assets/xml/objects/object_mizu_objects.xml
@@ -37,5 +37,20 @@
         <Collision Name="gObjectMizuObjectsShutterCol_0073F0" Offset="0x73F0"/>
 
         <Collision Name="gObjectMizuObjectsUzuCol_0074EC" Offset="0x74EC"/>
+
+        <Texture Name="object_mizu_objects_004C00_Tex" Format="rgba16" Width="32" Height="64" Offset="0x4C00"/>
+        <Texture Name="object_mizu_objects_005E70_Tex" Format="rgba16" Width="32" Height="64" Offset="0x5E70"/>
+        <Texture Name="object_mizu_objects_007520_Tex" Format="ia16" Width="32" Height="32" Offset="0x7520"/>
+        <Texture Name="object_mizu_objects_007D20_Tex" Format="rgba16" Width="32" Height="32" Offset="0x7D20"/>
+        <Texture Name="object_mizu_objects_008520_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8520"/>
+        <Texture Name="object_mizu_objects_008D20_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8D20"/>
+        <Texture Name="object_mizu_objects_009520_Tex" Format="i4" Width="32" Height="32" Offset="0x9520"/>
+        <Texture Name="object_mizu_objects_009720_Tex" Format="i4" Width="32" Height="32" Offset="0x9720"/>
+        <Texture Name="object_mizu_objects_009920_Tex" Format="i4" Width="32" Height="32" Offset="0x9920"/>
+        <Texture Name="object_mizu_objects_009B20_Tex" Format="i4" Width="32" Height="32" Offset="0x9B20"/>
+        <Texture Name="object_mizu_objects_009D20_Tex" Format="i4" Width="32" Height="32" Offset="0x9D20"/>
+        <Texture Name="object_mizu_objects_009F20_Tex" Format="rgba16" Width="32" Height="32" Offset="0x9F20"/>
+        <Texture Name="object_mizu_objects_00A720_Tex" Format="rgba16" Width="16" Height="32" Offset="0xA720"/>
+        <Texture Name="object_mizu_objects_00AB20_Tex" Format="i4" Width="64" Height="64" Offset="0xAB20"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml
index 834afe5ef0..38e98d9553 100644
--- a/assets/xml/objects/object_mm.xml
+++ b/assets/xml/objects/object_mm.xml
@@ -12,5 +12,45 @@
         <Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x730"/>
         <Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30" TlutOffset="0x730"/>
         <Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30" TlutOffset="0x730"/>
+
+        <Texture Name="object_mm_000930_Tex" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x730"/>
+        <Texture Name="object_mm_000970_Tex" Format="ci8" Width="8" Height="8" Offset="0x970" TlutOffset="0x730"/>
+        <Texture Name="object_mm_0009B0_Tex" Format="ci8" Width="8" Height="8" Offset="0x9B0" TlutOffset="0x730"/>
+        <Texture Name="object_mm_0009F0_Tex" Format="ci8" Width="8" Height="8" Offset="0x9F0" TlutOffset="0x730"/>
+        <Texture Name="object_mm_000A30_Tex" Format="ci8" Width="16" Height="16" Offset="0xA30" TlutOffset="0x730"/>
+        <Texture Name="object_mm_000B30_Tex" Format="ci8" Width="16" Height="16" Offset="0xB30" TlutOffset="0x730"/>
+        <Texture Name="object_mm_001030_Tex" Format="ci8" Width="16" Height="16" Offset="0x1030" TlutOffset="0x730"/>
+        <Texture Name="object_mm_001130_Tex" Format="ci8" Width="32" Height="16" Offset="0x1130" TlutOffset="0x730"/>
+        <Texture Name="object_mm_001330_Tex" Format="ci8" Width="16" Height="16" Offset="0x1330" TlutOffset="0x730"/>
+        <DList Name="object_mm_004010_DL" Offset="0x4010"/>
+        <DList Name="object_mm_004348_DL" Offset="0x4348"/>
+        <DList Name="object_mm_004A68_DL" Offset="0x4A68"/>
+        <DList Name="object_mm_004B98_DL" Offset="0x4B98"/>
+        <DList Name="object_mm_004CC8_DL" Offset="0x4CC8"/>
+        <DList Name="object_mm_004EC8_DL" Offset="0x4EC8"/>
+        <DList Name="object_mm_004FF8_DL" Offset="0x4FF8"/>
+        <DList Name="object_mm_005128_DL" Offset="0x5128"/>
+        <DList Name="object_mm_005328_DL" Offset="0x5328"/>
+        <DList Name="object_mm_0053C0_DL" Offset="0x53C0"/>
+        <DList Name="object_mm_005620_DL" Offset="0x5620"/>
+        <DList Name="object_mm_005788_DL" Offset="0x5788"/>
+        <DList Name="object_mm_0058B8_DL" Offset="0x58B8"/>
+        <DList Name="object_mm_005A90_DL" Offset="0x5A90"/>
+        <DList Name="object_mm_005BF8_DL" Offset="0x5BF8"/>
+        <Limb Name="object_mm_005D28_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D28" Offset="0x5D28"/>
+        <Limb Name="object_mm_005D34_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D34" Offset="0x5D34"/>
+        <Limb Name="object_mm_005D40_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D40" Offset="0x5D40"/>
+        <Limb Name="object_mm_005D4C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D4C" Offset="0x5D4C"/>
+        <Limb Name="object_mm_005D58_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D58" Offset="0x5D58"/>
+        <Limb Name="object_mm_005D64_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D64" Offset="0x5D64"/>
+        <Limb Name="object_mm_005D70_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D70" Offset="0x5D70"/>
+        <Limb Name="object_mm_005D7C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D7C" Offset="0x5D7C"/>
+        <Limb Name="object_mm_005D88_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D88" Offset="0x5D88"/>
+        <Limb Name="object_mm_005D94_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005D94" Offset="0x5D94"/>
+        <Limb Name="object_mm_005DA0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005DA0" Offset="0x5DA0"/>
+        <Limb Name="object_mm_005DAC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005DAC" Offset="0x5DAC"/>
+        <Limb Name="object_mm_005DB8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005DB8" Offset="0x5DB8"/>
+        <Limb Name="object_mm_005DC4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005DC4" Offset="0x5DC4"/>
+        <Limb Name="object_mm_005DD0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_MM_005DD0" Offset="0x5DD0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml
index 09a35dbd1c..49ab959e26 100644
--- a/assets/xml/objects/object_oF1d_map.xml
+++ b/assets/xml/objects/object_oF1d_map.xml
@@ -33,5 +33,55 @@
         <Texture Name="gGoronCsMouthNeutralTex" OutName="mouth_neutral" Format="ci8" Width="64" Height="32" Offset="0xDE80" TlutOffset="0xC640"/>
         <Texture Name="gGoronCsMouthSmileTex" OutName="mouth_smile" Format="ci8" Width="64" Height="32" Offset="0xE680" TlutOffset="0xC640"/>
 
+        <DList Name="object_oF1d_map_006F90_DL" Offset="0x6F90"/>
+        <DList Name="object_oF1d_map_007458_DL" Offset="0x7458"/>
+        <DList Name="object_oF1d_map_007D28_DL" Offset="0x7D28"/>
+        <DList Name="object_oF1d_map_007EB0_DL" Offset="0x7EB0"/>
+        <DList Name="object_oF1d_map_007FF0_DL" Offset="0x7FF0"/>
+        <DList Name="object_oF1d_map_008218_DL" Offset="0x8218"/>
+        <DList Name="object_oF1d_map_0083A0_DL" Offset="0x83A0"/>
+        <DList Name="object_oF1d_map_0084E0_DL" Offset="0x84E0"/>
+        <DList Name="object_oF1d_map_008708_DL" Offset="0x8708"/>
+        <DList Name="object_oF1d_map_0087D0_DL" Offset="0x87D0"/>
+        <DList Name="object_oF1d_map_0088C0_DL" Offset="0x88C0"/>
+        <DList Name="object_oF1d_map_008A10_DL" Offset="0x8A10"/>
+        <DList Name="object_oF1d_map_008C80_DL" Offset="0x8C80"/>
+        <DList Name="object_oF1d_map_008D70_DL" Offset="0x8D70"/>
+        <DList Name="object_oF1d_map_008EC0_DL" Offset="0x8EC0"/>
+        <Texture Name="object_oF1d_map_009130_TLUT" Format="rgba16" Width="160" Height="1" Offset="0x9130"/>
+        <Texture Name="object_oF1d_map_009270_Tex" Format="ci8" Width="8" Height="8" Offset="0x9270" TlutOffset="0x9130"/>
+        <Texture Name="object_oF1d_map_0092B0_Tex" Format="ci8" Width="8" Height="8" Offset="0x92B0" TlutOffset="0x9130"/>
+        <Texture Name="object_oF1d_map_0092F0_Tex" Format="ci8" Width="8" Height="16" Offset="0x92F0" TlutOffset="0x9130"/>
+        <Texture Name="object_oF1d_map_009370_Tex" Format="ci8" Width="32" Height="64" Offset="0x9370" TlutOffset="0x9130"/>
+        <Texture Name="object_oF1d_map_009B70_Tex" Format="ci8" Width="16" Height="16" Offset="0x9B70" TlutOffset="0x9130"/>
+        <Texture Name="object_oF1d_map_009C70_Tex" Format="rgba16" Width="64" Height="32" Offset="0x9C70"/>
+        <Texture Name="object_oF1d_map_00C440_TLUT" Format="rgba16" Width="240" Height="1" Offset="0xC440"/>
+        <Blob Name="object_oF1d_map_00C620_Blob" Size="0x20" Offset="0xC620"/>
+        <Texture Name="object_oF1d_map_00C840_Tex" Format="ci8" Width="8" Height="8" Offset="0xC840" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00C880_Tex" Format="ci8" Width="32" Height="16" Offset="0xC880" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00CA80_Tex" Format="ci8" Width="32" Height="32" Offset="0xCA80" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00EE80_Tex" Format="ci8" Width="32" Height="64" Offset="0xEE80" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00F680_Tex" Format="ci8" Width="8" Height="8" Offset="0xF680" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00F6C0_Tex" Format="ci8" Width="16" Height="16" Offset="0xF6C0" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00F7C0_Tex" Format="ci8" Width="16" Height="16" Offset="0xF7C0" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00F8C0_Tex" Format="ci8" Width="32" Height="32" Offset="0xF8C0" TlutOffset="0xC440"/>
+        <Texture Name="object_oF1d_map_00FCC0_Tex" Format="ci8" Width="8" Height="16" Offset="0xFCC0" TlutOffset="0xC440"/>
+        <Limb Name="object_oF1d_map_00FDE0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FDE0" Offset="0xFDE0"/>
+        <Limb Name="object_oF1d_map_00FDEC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FDEC" Offset="0xFDEC"/>
+        <Limb Name="object_oF1d_map_00FDF8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FDF8" Offset="0xFDF8"/>
+        <Limb Name="object_oF1d_map_00FE04_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE04" Offset="0xFE04"/>
+        <Limb Name="object_oF1d_map_00FE10_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE10" Offset="0xFE10"/>
+        <Limb Name="object_oF1d_map_00FE1C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE1C" Offset="0xFE1C"/>
+        <Limb Name="object_oF1d_map_00FE28_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE28" Offset="0xFE28"/>
+        <Limb Name="object_oF1d_map_00FE34_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE34" Offset="0xFE34"/>
+        <Limb Name="object_oF1d_map_00FE40_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE40" Offset="0xFE40"/>
+        <Limb Name="object_oF1d_map_00FE4C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE4C" Offset="0xFE4C"/>
+        <Limb Name="object_oF1d_map_00FE58_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE58" Offset="0xFE58"/>
+        <Limb Name="object_oF1d_map_00FE64_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE64" Offset="0xFE64"/>
+        <Limb Name="object_oF1d_map_00FE70_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE70" Offset="0xFE70"/>
+        <Limb Name="object_oF1d_map_00FE7C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE7C" Offset="0xFE7C"/>
+        <Limb Name="object_oF1d_map_00FE88_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE88" Offset="0xFE88"/>
+        <Limb Name="object_oF1d_map_00FE94_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FE94" Offset="0xFE94"/>
+        <Limb Name="object_oF1d_map_00FEA0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OF1D_MAP_00FEA0" Offset="0xFEA0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_okuta.xml b/assets/xml/objects/object_okuta.xml
index b4fccea6f3..d1698ba6ef 100644
--- a/assets/xml/objects/object_okuta.xml
+++ b/assets/xml/objects/object_okuta.xml
@@ -25,5 +25,59 @@
         <!-- Projectile -->
         <Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgba16" Width="16" Height="16" Offset="0x3150"/>
         <DList Name="gOctorokProjectileDL" Offset="0x3380"/>
+
+
+        <DList Name="object_okuta_0016D0_DL" Offset="0x16D0"/>
+        <DList Name="object_okuta_0017C0_DL" Offset="0x17C0"/>
+        <DList Name="object_okuta_001A70_DL" Offset="0x1A70"/>
+        <DList Name="object_okuta_001B70_DL" Offset="0x1B70"/>
+        <DList Name="object_okuta_001C00_DL" Offset="0x1C00"/>
+        <DList Name="object_okuta_001C98_DL" Offset="0x1C98"/>
+        <DList Name="object_okuta_001D28_DL" Offset="0x1D28"/>
+        <DList Name="object_okuta_001DB8_DL" Offset="0x1DB8"/>
+        <DList Name="object_okuta_001E50_DL" Offset="0x1E50"/>
+        <DList Name="object_okuta_001EE0_DL" Offset="0x1EE0"/>
+        <DList Name="object_okuta_001F70_DL" Offset="0x1F70"/>
+        <DList Name="object_okuta_002008_DL" Offset="0x2008"/>
+        <DList Name="object_okuta_002098_DL" Offset="0x2098"/>
+        <DList Name="object_okuta_002128_DL" Offset="0x2128"/>
+        <DList Name="object_okuta_0021C0_DL" Offset="0x21C0"/>
+        <Limb Name="object_okuta_003410_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003410" Offset="0x3410"/>
+        <Limb Name="object_okuta_00341C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00341C" Offset="0x341C"/>
+        <Limb Name="object_okuta_003428_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003428" Offset="0x3428"/>
+        <Limb Name="object_okuta_003434_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003434" Offset="0x3434"/>
+        <Limb Name="object_okuta_003440_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003440" Offset="0x3440"/>
+        <Limb Name="object_okuta_00344C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00344C" Offset="0x344C"/>
+        <Limb Name="object_okuta_003458_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003458" Offset="0x3458"/>
+        <Limb Name="object_okuta_003464_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003464" Offset="0x3464"/>
+        <Limb Name="object_okuta_003470_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003470" Offset="0x3470"/>
+        <Limb Name="object_okuta_00347C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00347C" Offset="0x347C"/>
+        <Limb Name="object_okuta_003488_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003488" Offset="0x3488"/>
+        <Limb Name="object_okuta_003494_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003494" Offset="0x3494"/>
+        <Limb Name="object_okuta_0034A0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034A0" Offset="0x34A0"/>
+        <Limb Name="object_okuta_0034AC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034AC" Offset="0x34AC"/>
+        <Limb Name="object_okuta_0034B8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034B8" Offset="0x34B8"/>
+        <Limb Name="object_okuta_0034C4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034C4" Offset="0x34C4"/>
+        <Limb Name="object_okuta_0034D0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034D0" Offset="0x34D0"/>
+        <Limb Name="object_okuta_0034DC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034DC" Offset="0x34DC"/>
+        <Limb Name="object_okuta_0034E8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034E8" Offset="0x34E8"/>
+        <Limb Name="object_okuta_0034F4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0034F4" Offset="0x34F4"/>
+        <Limb Name="object_okuta_003500_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003500" Offset="0x3500"/>
+        <Limb Name="object_okuta_00350C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00350C" Offset="0x350C"/>
+        <Limb Name="object_okuta_003518_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003518" Offset="0x3518"/>
+        <Limb Name="object_okuta_003524_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003524" Offset="0x3524"/>
+        <Limb Name="object_okuta_003530_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003530" Offset="0x3530"/>
+        <Limb Name="object_okuta_00353C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00353C" Offset="0x353C"/>
+        <Limb Name="object_okuta_003548_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003548" Offset="0x3548"/>
+        <Limb Name="object_okuta_003554_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003554" Offset="0x3554"/>
+        <Limb Name="object_okuta_003560_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003560" Offset="0x3560"/>
+        <Limb Name="object_okuta_00356C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00356C" Offset="0x356C"/>
+        <Limb Name="object_okuta_003578_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003578" Offset="0x3578"/>
+        <Limb Name="object_okuta_003584_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003584" Offset="0x3584"/>
+        <Limb Name="object_okuta_003590_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_003590" Offset="0x3590"/>
+        <Limb Name="object_okuta_00359C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_00359C" Offset="0x359C"/>
+        <Limb Name="object_okuta_0035A8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0035A8" Offset="0x35A8"/>
+        <Limb Name="object_okuta_0035B4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0035B4" Offset="0x35B4"/>
+        <Limb Name="object_okuta_0035C0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OKUTA_0035C0" Offset="0x35C0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml
index 4ea2006678..b9185a55f7 100644
--- a/assets/xml/objects/object_owl.xml
+++ b/assets/xml/objects/object_owl.xml
@@ -67,5 +67,43 @@
         <Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>
         <Texture Name="gObjOwlEyeHalfTex" OutName="owl_eye_half" Format="ci8" Width="32" Height="32" Offset="0x8DA8" TlutOffset="0x6DA8"/>
         <Texture Name="gObjOwlEyeClosedTex" OutName="owl_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x91A8" TlutOffset="0x6DA8"/>
+
+        <Texture Name="object_owl_0071A8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x71A8"/>
+        <Texture Name="object_owl_0079A8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x79A8"/>
+        <Texture Name="object_owl_0081A8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x81A8"/>
+        <Texture Name="object_owl_0095A8_Tex" Format="rgba16" Width="32" Height="32" Offset="0x95A8"/>
+        <Texture Name="object_owl_009DA8_Tex" Format="rgba16" Width="16" Height="16" Offset="0x9DA8"/>
+        <Texture Name="object_owl_009FA8_Tex" Format="rgba16" Width="64" Height="32" Offset="0x9FA8"/>
+        <Texture Name="object_owl_00AFA8_Tex" Format="rgba16" Width="32" Height="32" Offset="0xAFA8"/>
+        <Texture Name="object_owl_00B7A8_Tex" Format="rgba16" Width="32" Height="32" Offset="0xB7A8"/>
+        <DList Name="object_owl_00ED10_DL" Offset="0xED10"/>
+        <DList Name="object_owl_00EEA0_DL" Offset="0xEEA0"/>
+        <DList Name="object_owl_00F030_DL" Offset="0xF030"/>
+        <DList Name="object_owl_00F0D8_DL" Offset="0xF0D8"/>
+        <DList Name="object_owl_00F1C0_DL" Offset="0xF1C0"/>
+        <DList Name="object_owl_00F330_DL" Offset="0xF330"/>
+        <DList Name="object_owl_00F7B0_DL" Offset="0xF7B0"/>
+        <DList Name="object_owl_00F868_DL" Offset="0xF868"/>
+        <DList Name="object_owl_00F920_DL" Offset="0xF920"/>
+        <DList Name="object_owl_00F9E8_DL" Offset="0xF9E8"/>
+        <DList Name="object_owl_00FAD8_DL" Offset="0xFAD8"/>
+        <DList Name="object_owl_00FC70_DL" Offset="0xFC70"/>
+        <DList Name="object_owl_00FD38_DL" Offset="0xFD38"/>
+        <DList Name="object_owl_00FE28_DL" Offset="0xFE28"/>
+        <Limb Name="object_owl_00FFC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_00FFC0" Offset="0xFFC0"/>
+        <Limb Name="object_owl_00FFCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_00FFCC" Offset="0xFFCC"/>
+        <Limb Name="object_owl_00FFD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_00FFD8" Offset="0xFFD8"/>
+        <Limb Name="object_owl_00FFE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_00FFE4" Offset="0xFFE4"/>
+        <Limb Name="object_owl_00FFF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_00FFF0" Offset="0xFFF0"/>
+        <Limb Name="object_owl_00FFFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_00FFFC" Offset="0xFFFC"/>
+        <Limb Name="object_owl_010008_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010008" Offset="0x10008"/>
+        <Limb Name="object_owl_010014_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010014" Offset="0x10014"/>
+        <Limb Name="object_owl_010020_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010020" Offset="0x10020"/>
+        <Limb Name="object_owl_01002C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_01002C" Offset="0x1002C"/>
+        <Limb Name="object_owl_010038_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010038" Offset="0x10038"/>
+        <Limb Name="object_owl_010044_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010044" Offset="0x10044"/>
+        <Limb Name="object_owl_010050_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010050" Offset="0x10050"/>
+        <Limb Name="object_owl_01005C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_01005C" Offset="0x1005C"/>
+        <Limb Name="object_owl_010068_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_OWL_010068" Offset="0x10068"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml
index cd47562236..35e8e6b980 100644
--- a/assets/xml/objects/object_ru2.xml
+++ b/assets/xml/objects/object_ru2.xml
@@ -142,6 +142,8 @@
         <Texture Name="gAdultRutoTex_5440" OutName="adult_ruto_tex_5440" Format="ci8" Width="8" Height="8" Offset="0x5440" TlutOffset="0x43C0"/>
         <Texture Name="gAdultRutoTex_5480" OutName="adult_ruto_tex_5480" Format="ci8" Width="16" Height="16" Offset="0x5480" TlutOffset="0x43C0"/>
         <Texture Name="gAdultRutoTex_5580" OutName="adult_ruto_tex_5580" Format="ci8" Width="8" Height="8" Offset="0x5580" TlutOffset="0x43C0"/>
+        <Texture Name="object_ru2_0055C0_Tex" Format="ci8" Width="8" Height="32" Offset="0x55C0" TlutOffset="0x43C0"/>
+        <Texture Name="object_ru2_0056C0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x56C0"/>
 
         <!-- Adult Ruto Animations -->
         <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
diff --git a/assets/xml/objects/object_sa.xml b/assets/xml/objects/object_sa.xml
index 1d666c9b26..62dcda8697 100644
--- a/assets/xml/objects/object_sa.xml
+++ b/assets/xml/objects/object_sa.xml
@@ -122,6 +122,7 @@
 
         <Texture Name="gSariaBootsTex" OutName="boots" Format="ci8" Width="16" Height="16" Offset="0x23F0" TlutOffset="0x21F0"/>
         <Texture Name="gSariaGreenTex" OutName="green" Format="ci8" Width="8" Height="8" Offset="0x24F0" TlutOffset="0x21F0"/>
+        <Texture Name="object_sa_002530_Tex" Format="ci8" Width="8" Height="8" Offset="0x2530" TlutOffset="0x21F0"/>
         <Texture Name="gSariaKneeTex" OutName="knee" Format="ci8" Width="16" Height="16" Offset="0x2570" TlutOffset="0x21F0"/>
         <Texture Name="gSariaTorsoTex" OutName="torso" Format="ci8" Width="16" Height="16" Offset="0x2670" TlutOffset="0x21F0"/>
         <Texture Name="gSariaBeltTex" OutName="belt" Format="ci8" Width="16" Height="16" Offset="0x2770" TlutOffset="0x21F0"/>
diff --git a/assets/xml/objects/object_skj.xml b/assets/xml/objects/object_skj.xml
index 866a38c73b..1e4dffa648 100644
--- a/assets/xml/objects/object_skj.xml
+++ b/assets/xml/objects/object_skj.xml
@@ -120,5 +120,16 @@
         <Texture Name="gSkullKidSkullMaskTex" OutName="skull_mask" Format="rgba16" Width="16" Height="16" Offset="0xF08"/>
         <Texture Name="gSkullKidSkullMaskTeethTex" OutName="skull_mask_teeth" Format="rgba16" Width="8" Height="8" Offset="0x1108"/>
         <Texture Name="gSkullKidSkullMaskNoseTex" OutName="skull_mask_nose" Format="rgba16" Width="8" Height="8" Offset="0x1188"/>
+
+        <DList Name="object_skj_0036A0_DL" Offset="0x36A0"/>
+        <DList Name="object_skj_003E48_DL" Offset="0x3E48"/>
+        <Texture Name="object_skj_005300_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5300"/>
+        <Texture Name="object_skj_005500_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5500"/>
+        <Texture Name="object_skj_005700_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5700"/>
+        <Texture Name="object_skj_005900_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5900"/>
+        <Texture Name="object_skj_005B00_Tex" Format="rgba16" Width="8" Height="8" Offset="0x5B00"/>
+        <Texture Name="object_skj_005B80_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5B80"/>
+        <Texture Name="object_skj_005D80_Tex" Format="rgba16" Width="4" Height="4" Offset="0x5D80"/>
+        <Texture Name="object_skj_005DA0_Tex" Format="ia16" Width="8" Height="8" Offset="0x5DA0"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_spot01_matoya.xml b/assets/xml/objects/object_spot01_matoya.xml
index a06d296a11..f8c3ec6d02 100644
--- a/assets/xml/objects/object_spot01_matoya.xml
+++ b/assets/xml/objects/object_spot01_matoya.xml
@@ -40,6 +40,7 @@
 
         <!-- Palettes -->
         <Texture Name="gKakarikoShootingGalleryTLUT" OutName="shooting_gallery_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Blob Name="object_spot01_matoya_000200_Blob" Size="0x8" Offset="0x200"/>
         <Texture Name="gKakarikoBazaarSignTLUT" OutName="bazaar_sign_tlut" Format="rgba16" Width="4" Height="4" Offset="0x2810"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_spot01_matoyab.xml b/assets/xml/objects/object_spot01_matoyab.xml
index 720f50cd3e..8c1e933246 100644
--- a/assets/xml/objects/object_spot01_matoyab.xml
+++ b/assets/xml/objects/object_spot01_matoyab.xml
@@ -10,6 +10,7 @@
         <!-- Kakariko Construction Site -->
         <DList Name="gKakarikoConstructionSiteDL" Offset="0x1228"/>
         <Texture Name="gKakarikoConstructionSiteTLUT" OutName="construction_site_tlut" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
+        <Blob Name="object_spot01_matoyab_000200_Blob" Size="0x8" Offset="0x200"/>
         <Texture Name="gKakarikoConstructionSiteBrickWithGrassTex" OutName="construction_site_brick_with_grass" Format="ci8" Width="16" Height="32" Offset="0x0208" TlutOffset="0x0"/>
         <Texture Name="gKakarikoConstructionSiteBrickTex" OutName="construction_site_brick" Format="ci8" Width="16" Height="32" Offset="0x0408" TlutOffset="0x0"/>
         <Texture Name="gKakarikoConstructionSitRailingTex" OutName="construction_site_railing" Format="ci8" Width="16" Height="8" Offset="0x0608" TlutOffset="0x0"/>
diff --git a/assets/xml/objects/object_spot09_obj.xml b/assets/xml/objects/object_spot09_obj.xml
index b4d9ae42a1..d86cf59874 100644
--- a/assets/xml/objects/object_spot09_obj.xml
+++ b/assets/xml/objects/object_spot09_obj.xml
@@ -10,5 +10,26 @@
         <Collision Name="gValleyObjects2Col" Offset="0x283C"/>
         <Collision Name="gValleyObjects3Col" Offset="0x8458"/>
         <Collision Name="gValleyObjects4Col" Offset="0x7580"/>
+        <Texture Name="object_spot09_obj_008490_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8490"/>
+        <Texture Name="object_spot09_obj_008C90_Tex" Format="rgba16" Width="32" Height="32" Offset="0x8C90"/>
+        <Texture Name="object_spot09_obj_009490_Tex" Format="rgba16" Width="64" Height="32" Offset="0x9490"/>
+        <Texture Name="object_spot09_obj_00A490_Tex" Format="rgba16" Width="32" Height="32" Offset="0xA490"/>
+        <Texture Name="object_spot09_obj_00AC90_Tex" Format="rgba16" Width="32" Height="32" Offset="0xAC90"/>
+        <Texture Name="object_spot09_obj_00B490_Tex" Format="rgba16" Width="32" Height="32" Offset="0xB490"/>
+        <Texture Name="object_spot09_obj_00BC90_Tex" Format="rgba16" Width="32" Height="64" Offset="0xBC90"/>
+        <Texture Name="object_spot09_obj_00CC90_Tex" Format="rgba16" Width="64" Height="32" Offset="0xCC90"/>
+        <Texture Name="object_spot09_obj_00DC90_Tex" Format="rgba16" Width="32" Height="64" Offset="0xDC90"/>
+        <Texture Name="object_spot09_obj_00EC90_Tex" Format="rgba16" Width="64" Height="32" Offset="0xEC90"/>
+        <Texture Name="object_spot09_obj_00FC90_Tex" Format="rgba16" Width="16" Height="32" Offset="0xFC90"/>
+        <Texture Name="object_spot09_obj_010090_Tex" Format="rgba16" Width="64" Height="32" Offset="0x10090"/>
+        <Texture Name="object_spot09_obj_011090_Tex" Format="rgba16" Width="32" Height="64" Offset="0x11090"/>
+        <Texture Name="object_spot09_obj_012090_Tex" Format="rgba16" Width="64" Height="32" Offset="0x12090"/>
+        <Texture Name="object_spot09_obj_013090_Tex" Format="rgba16" Width="64" Height="32" Offset="0x13090"/>
+        <Texture Name="object_spot09_obj_014090_Tex" Format="rgba16" Width="64" Height="32" Offset="0x14090"/>
+        <Texture Name="object_spot09_obj_015090_Tex" Format="rgba16" Width="32" Height="64" Offset="0x15090"/>
+        <Texture Name="object_spot09_obj_016090_Tex" Format="rgba16" Width="32" Height="64" Offset="0x16090"/>
+        <Texture Name="object_spot09_obj_017090_Tex" Format="i8" Width="32" Height="32" Offset="0x17090"/>
+        <Texture Name="object_spot09_obj_017490_Tex" Format="i8" Width="32" Height="32" Offset="0x17490"/>
+        <Texture Name="object_spot09_obj_017890_Tex" Format="i4" Width="128" Height="64" Offset="0x17890"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_torch2.xml b/assets/xml/objects/object_torch2.xml
index ec55bbe26d..09d9ff8a40 100644
--- a/assets/xml/objects/object_torch2.xml
+++ b/assets/xml/objects/object_torch2.xml
@@ -7,5 +7,46 @@
 
         <!-- Dark Link DLists -->
         <DList Name="sDarkLinkSheathDL" Offset="0x3748"/>
+
+        <DList Name="object_torch2_002BD0_DL" Offset="0x2BD0"/>
+        <DList Name="object_torch2_002CD0_DL" Offset="0x2CD0"/>
+        <DList Name="object_torch2_002E10_DL" Offset="0x2E10"/>
+        <DList Name="object_torch2_002F38_DL" Offset="0x2F38"/>
+        <DList Name="object_torch2_003030_DL" Offset="0x3030"/>
+        <DList Name="object_torch2_003178_DL" Offset="0x3178"/>
+        <DList Name="object_torch2_0032A0_DL" Offset="0x32A0"/>
+        <DList Name="object_torch2_003398_DL" Offset="0x3398"/>
+        <DList Name="object_torch2_003490_DL" Offset="0x3490"/>
+        <DList Name="object_torch2_003820_DL" Offset="0x3820"/>
+        <DList Name="object_torch2_0038D0_DL" Offset="0x38D0"/>
+        <DList Name="object_torch2_0039E8_DL" Offset="0x39E8"/>
+        <DList Name="object_torch2_003B08_DL" Offset="0x3B08"/>
+        <DList Name="object_torch2_003C10_DL" Offset="0x3C10"/>
+        <DList Name="object_torch2_003D70_DL" Offset="0x3D70"/>
+        <DList Name="object_torch2_003E90_DL" Offset="0x3E90"/>
+        <DList Name="object_torch2_003F98_DL" Offset="0x3F98"/>
+        <Texture Name="object_torch2_0041C0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x41C0"/>
+        <Texture Name="object_torch2_0043C0_Tex" Format="ia16" Width="16" Height="16" Offset="0x43C0"/>
+        <Limb Name="object_torch2_0045C0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0045C0" Offset="0x45C0"/>
+        <Limb Name="object_torch2_0045D0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0045D0" Offset="0x45D0"/>
+        <Limb Name="object_torch2_0045E0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0045E0" Offset="0x45E0"/>
+        <Limb Name="object_torch2_0045F0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0045F0" Offset="0x45F0"/>
+        <Limb Name="object_torch2_004600_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004600" Offset="0x4600"/>
+        <Limb Name="object_torch2_004610_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004610" Offset="0x4610"/>
+        <Limb Name="object_torch2_004620_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004620" Offset="0x4620"/>
+        <Limb Name="object_torch2_004630_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004630" Offset="0x4630"/>
+        <Limb Name="object_torch2_004640_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004640" Offset="0x4640"/>
+        <Limb Name="object_torch2_004650_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004650" Offset="0x4650"/>
+        <Limb Name="object_torch2_004660_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004660" Offset="0x4660"/>
+        <Limb Name="object_torch2_004670_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004670" Offset="0x4670"/>
+        <Limb Name="object_torch2_004680_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004680" Offset="0x4680"/>
+        <Limb Name="object_torch2_004690_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004690" Offset="0x4690"/>
+        <Limb Name="object_torch2_0046A0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0046A0" Offset="0x46A0"/>
+        <Limb Name="object_torch2_0046B0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0046B0" Offset="0x46B0"/>
+        <Limb Name="object_torch2_0046C0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0046C0" Offset="0x46C0"/>
+        <Limb Name="object_torch2_0046D0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0046D0" Offset="0x46D0"/>
+        <Limb Name="object_torch2_0046E0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0046E0" Offset="0x46E0"/>
+        <Limb Name="object_torch2_0046F0_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_0046F0" Offset="0x46F0"/>
+        <Limb Name="object_torch2_004700_Limb" LimbType="LOD" EnumName="LIMB_OBJECT_TORCH2_004700" Offset="0x4700"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_wallmaster.xml b/assets/xml/objects/object_wallmaster.xml
index fbbc4f4af3..2003606c08 100644
--- a/assets/xml/objects/object_wallmaster.xml
+++ b/assets/xml/objects/object_wallmaster.xml
@@ -31,5 +31,45 @@
 
         <!-- Unused. Name inferred from OoT3D -->
         <Animation Name="gWallmasterMissAnim" Offset="0x3120"/>
+
+
+        <DList Name="object_wallmaster_006660_DL" Offset="0x6660"/>
+        <DList Name="object_wallmaster_006800_DL" Offset="0x6800"/>
+        <DList Name="object_wallmaster_006A20_DL" Offset="0x6A20"/>
+        <DList Name="object_wallmaster_006C58_DL" Offset="0x6C58"/>
+        <DList Name="object_wallmaster_006E98_DL" Offset="0x6E98"/>
+        <DList Name="object_wallmaster_007038_DL" Offset="0x7038"/>
+        <DList Name="object_wallmaster_007258_DL" Offset="0x7258"/>
+        <DList Name="object_wallmaster_007408_DL" Offset="0x7408"/>
+        <DList Name="object_wallmaster_0075A8_DL" Offset="0x75A8"/>
+        <DList Name="object_wallmaster_0077C8_DL" Offset="0x77C8"/>
+        <DList Name="object_wallmaster_007978_DL" Offset="0x7978"/>
+        <DList Name="object_wallmaster_007B18_DL" Offset="0x7B18"/>
+        <DList Name="object_wallmaster_007CE8_DL" Offset="0x7CE8"/>
+        <DList Name="object_wallmaster_007E98_DL" Offset="0x7E98"/>
+        <Limb Name="object_wallmaster_008E30_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E30" Offset="0x8E30"/>
+        <Limb Name="object_wallmaster_008E3C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E3C" Offset="0x8E3C"/>
+        <Limb Name="object_wallmaster_008E48_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E48" Offset="0x8E48"/>
+        <Limb Name="object_wallmaster_008E54_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E54" Offset="0x8E54"/>
+        <Limb Name="object_wallmaster_008E60_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E60" Offset="0x8E60"/>
+        <Limb Name="object_wallmaster_008E6C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E6C" Offset="0x8E6C"/>
+        <Limb Name="object_wallmaster_008E78_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E78" Offset="0x8E78"/>
+        <Limb Name="object_wallmaster_008E84_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E84" Offset="0x8E84"/>
+        <Limb Name="object_wallmaster_008E90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E90" Offset="0x8E90"/>
+        <Limb Name="object_wallmaster_008E9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008E9C" Offset="0x8E9C"/>
+        <Limb Name="object_wallmaster_008EA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008EA8" Offset="0x8EA8"/>
+        <Limb Name="object_wallmaster_008EB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008EB4" Offset="0x8EB4"/>
+        <Limb Name="object_wallmaster_008EC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008EC0" Offset="0x8EC0"/>
+        <Limb Name="object_wallmaster_008ECC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008ECC" Offset="0x8ECC"/>
+        <Limb Name="object_wallmaster_008ED8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008ED8" Offset="0x8ED8"/>
+        <Limb Name="object_wallmaster_008EE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008EE4" Offset="0x8EE4"/>
+        <Limb Name="object_wallmaster_008EF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008EF0" Offset="0x8EF0"/>
+        <Limb Name="object_wallmaster_008EFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008EFC" Offset="0x8EFC"/>
+        <Limb Name="object_wallmaster_008F08_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008F08" Offset="0x8F08"/>
+        <Limb Name="object_wallmaster_008F14_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008F14" Offset="0x8F14"/>
+        <Limb Name="object_wallmaster_008F20_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008F20" Offset="0x8F20"/>
+        <Limb Name="object_wallmaster_008F2C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008F2C" Offset="0x8F2C"/>
+        <Limb Name="object_wallmaster_008F38_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008F38" Offset="0x8F38"/>
+        <Limb Name="object_wallmaster_008F44_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_WALLMASTER_008F44" Offset="0x8F44"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ydan_objects.xml b/assets/xml/objects/object_ydan_objects.xml
index 70174a1e70..298b892c75 100644
--- a/assets/xml/objects/object_ydan_objects.xml
+++ b/assets/xml/objects/object_ydan_objects.xml
@@ -7,14 +7,17 @@
         <Texture Name="gYdanHasiFloatingBlockBottomTex" OutName="floating_block_bottom" Format="rgba16" Width="32" Height="32" Offset="0x800"/>
         <Texture Name="gYdanUnused1Tex" OutName="unused_1" Format="ci8" Width="32" Height="64" Offset="0x6BC8" TlutOffset="0x69C0"/>
         <Texture Name="gYdanHasi2TLUT" OutName="tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x69C0"/>
+        <Blob Name="object_ydan_objects_006BC0_Blob" Size="0x8" Offset="0x6BC0"/>
         <Texture Name="gYdanHasi3BlocksTopTex" OutName="three_blocks_top" Format="ci8" Width="32" Height="64" Offset="0x3AF8" TlutOffset="0x38F0"/>
         <Texture Name="gYdanTLUT_38F0" OutName="tlut_3" Format="rgba16" Width="16" Height="16" Offset="0x38F0"/> <!--3Blocks Palette?-->
+        <Blob Name="object_ydan_objects_003AF0_Blob" Size="0x8" Offset="0x3AF0"/>
         <Texture Name="gYdanHasi3BlocksSideTex" OutName="three_blocks_side" Format="ci8" Width="32" Height="64" Offset="0x42F8" TlutOffset="0x38F0"/>
         <Texture Name="gYdanHasiWaterTex" OutName="water_tex" Format="ci8" Width="32" Height="32" Offset="0x5950" TlutOffset="0x57B0"/>
         <Texture Name="gYdanHasiWaterTLUT" OutName="water_tlut" Format="rgba16" Width="208" Height="1" Offset="0x57B0"/>
         <Texture Name="gYdanMarutaUnused1Tex" OutName="maruta_unused_1" Format="rgba16" Width="32" Height="32" Offset="0x2000"/>
         <Texture Name="gYdanMarutaUnused2Tex" OutName="maruta_unused_2" Format="ci8" Width="32" Height="64" Offset="0x79D8" TlutOffset="0x77D0"/>
         <Texture Name="gYdanMaruta1TLUT" OutName="maruta_tlut" Format="rgba16" Width="16" Height="16" Offset="0x77D0"/>
+        <Blob Name="object_ydan_objects_0079D0_Blob" Size="0x8" Offset="0x79D0"/>
         <DList Name="gDTUnknownWebDL" Offset="0x3850"/>
         <DList Name="gDTRisingPlatformsDL" Offset="0x5018"/>
         <DList Name="gDTWaterPlaneDL" Offset="0x5DE0"/>
diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml
index c409c6033d..42918cdbdc 100644
--- a/assets/xml/objects/object_zl1.xml
+++ b/assets/xml/objects/object_zl1.xml
@@ -122,6 +122,7 @@
         <Texture Name="gChildZelda1Tex_A848" OutName="tex_A848" Format="rgba16" Width="8" Height="8" Offset="0xA848"/>
         <Texture Name="gChildZelda1HeaddressTex_A8C8" OutName="headdress_A8C8" Format="ci8" Width="8" Height="16" Offset="0xA8C8" TlutOffset="0x70C8"/>
         <Texture Name="gChildZelda1HeaddressStripeTex" OutName="headdress_stripe" Format="ci8" Width="16" Height="32" Offset="0xA948" TlutOffset="0x70C8"/>
+        <Texture Name="object_zl1_00EE58_Tex" Format="rgba16" Width="32" Height="16" Offset="0xEE58"/>
 
         <!-- Other Vertices and DisplayLists -->
         <Array Name="gChildZelda1AlternateDressVtx" Count="147" Offset="0xBD68">
diff --git a/assets/xml/objects/object_zl2.xml b/assets/xml/objects/object_zl2.xml
index 2503b811d3..f910906920 100644
--- a/assets/xml/objects/object_zl2.xml
+++ b/assets/xml/objects/object_zl2.xml
@@ -40,5 +40,64 @@
         <Texture Name="gZelda2TriforceTex" OutName="zelda_2_triforce" Format="rgba16" Width="16" Height="16" Offset="0x2900"/>
 
         <Texture Name="gZelda2Tex_003A08" OutName="tex_003A08" Format="ci8" Width="8" Height="8" Offset="0x3A08" TlutOffset="0x2F50"/>
+        <Texture Name="object_zl2_000E00_Tex" Format="ci8" Width="16" Height="16" Offset="0xE00" TlutOffset="0x0"/>
+        <Texture Name="object_zl2_000F00_Tex" Format="ci8" Width="8" Height="8" Offset="0xF00" TlutOffset="0x0"/>
+        <Texture Name="object_zl2_000F40_Tex" Format="ci8" Width="16" Height="32" Offset="0xF40" TlutOffset="0x0"/>
+        <Texture Name="object_zl2_001140_Tex" Format="ci8" Width="8" Height="8" Offset="0x1140" TlutOffset="0x0"/>
+        <Texture Name="object_zl2_001180_Tex" Format="ci8" Width="16" Height="16" Offset="0x1180" TlutOffset="0x200"/>
+        <Texture Name="object_zl2_001280_Tex" Format="ci8" Width="8" Height="8" Offset="0x1280" TlutOffset="0x200"/>
+        <Texture Name="object_zl2_0012C0_Tex" Format="ci8" Width="16" Height="64" Offset="0x12C0" TlutOffset="0x0"/>
+        <Texture Name="object_zl2_0016C0_Tex" Format="ci8" Width="32" Height="32" Offset="0x16C0" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_001AC0_Tex" Format="ci8" Width="32" Height="16" Offset="0x1AC0" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_001CC0_Tex" Format="ci8" Width="32" Height="64" Offset="0x1CC0" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_0024C0_Tex" Format="ci8" Width="8" Height="8" Offset="0x24C0" TlutOffset="0x200"/>
+        <Texture Name="object_zl2_002500_Tex" Format="ci8" Width="16" Height="16" Offset="0x2500" TlutOffset="0x200"/>
+        <Texture Name="object_zl2_002600_Tex" Format="ci8" Width="32" Height="8" Offset="0x2600" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_002700_Tex" Format="ci8" Width="8" Height="8" Offset="0x2700" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_002740_Tex" Format="ci8" Width="8" Height="8" Offset="0x2740" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_002780_Tex" Format="ci8" Width="16" Height="16" Offset="0x2780" TlutOffset="0x400"/>
+        <Texture Name="object_zl2_002880_Tex" Format="ci8" Width="8" Height="16" Offset="0x2880" TlutOffset="0x200"/>
+        <Texture Name="object_zl2_0034C8_Tex" Format="ci8" Width="8" Height="8" Offset="0x34C8" TlutOffset="0x2D00"/>
+        <Texture Name="object_zl2_003908_Tex" Format="ci8" Width="16" Height="16" Offset="0x3908" TlutOffset="0x2D00"/>
+        <Texture Name="object_zl2_003A48_Tex" Format="ci8" Width="8" Height="16" Offset="0x3A48" TlutOffset="0x2F50"/>
+        <Texture Name="object_zl2_003AC8_Tex" Format="ci8" Width="16" Height="8" Offset="0x3AC8" TlutOffset="0x2F50"/>
+        <Texture Name="object_zl2_003B48_Tex" Format="ci8" Width="16" Height="16" Offset="0x3B48" TlutOffset="0x2F50"/>
+        <Texture Name="object_zl2_004448_Tex" Format="ci8" Width="16" Height="16" Offset="0x4448" TlutOffset="0x2F50"/>
+        <Texture Name="object_zl2_006548_Tex" Format="ci8" Width="32" Height="16" Offset="0x6548" TlutOffset="0x2F50"/>
+        <DList Name="object_zl2_007DC8_DL" Offset="0x7DC8"/>
+        <Texture Name="object_zl2_009738_Tex" Format="ci8" Width="16" Height="32" Offset="0x9738" TlutOffset="0x95A0"/>
+        <Texture Name="object_zl2_009938_Tex" Format="ci8" Width="16" Height="16" Offset="0x9938" TlutOffset="0x9490"/>
+        <Texture Name="object_zl2_009A38_Tex" Format="ci8" Width="8" Height="8" Offset="0x9A38" TlutOffset="0x9490"/>
+        <Texture Name="object_zl2_009A78_Tex" Format="ci8" Width="32" Height="32" Offset="0x9A78" TlutOffset="0x9490"/>
+        <Texture Name="object_zl2_009E78_Tex" Format="ci8" Width="16" Height="16" Offset="0x9E78" TlutOffset="0x95A0"/>
+        <Texture Name="object_zl2_009F78_Tex" Format="ci8" Width="8" Height="16" Offset="0x9F78" TlutOffset="0x95A0"/>
+        <Texture Name="object_zl2_009FF8_Tex" Format="ci8" Width="16" Height="16" Offset="0x9FF8" TlutOffset="0x9708"/>
+        <Texture Name="object_zl2_00A0F8_Tex" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9708"/>
+        <DList Name="object_zl2_00B068_DL" Offset="0xB068"/>
+        <DList Name="object_zl2_00E590_DL" Offset="0xE590"/>
+        <DList Name="object_zl2_00E910_DL" Offset="0xE910"/>
+        <DList Name="object_zl2_00EA58_DL" Offset="0xEA58"/>
+        <DList Name="object_zl2_00ED60_DL" Offset="0xED60"/>
+        <DList Name="object_zl2_00F0E0_DL" Offset="0xF0E0"/>
+        <DList Name="object_zl2_00F228_DL" Offset="0xF228"/>
+        <DList Name="object_zl2_00F530_DL" Offset="0xF530"/>
+        <DList Name="object_zl2_0102D8_DL" Offset="0x102D8"/>
+        <DList Name="object_zl2_0108E8_DL" Offset="0x108E8"/>
+        <DList Name="object_zl2_010A20_DL" Offset="0x10A20"/>
+        <DList Name="object_zl2_010B58_DL" Offset="0x10B58"/>
+        <Limb Name="object_zl2_010C90_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010C90" Offset="0x10C90"/>
+        <Limb Name="object_zl2_010C9C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010C9C" Offset="0x10C9C"/>
+        <Limb Name="object_zl2_010CA8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CA8" Offset="0x10CA8"/>
+        <Limb Name="object_zl2_010CB4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CB4" Offset="0x10CB4"/>
+        <Limb Name="object_zl2_010CC0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CC0" Offset="0x10CC0"/>
+        <Limb Name="object_zl2_010CCC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CCC" Offset="0x10CCC"/>
+        <Limb Name="object_zl2_010CD8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CD8" Offset="0x10CD8"/>
+        <Limb Name="object_zl2_010CE4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CE4" Offset="0x10CE4"/>
+        <Limb Name="object_zl2_010CF0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CF0" Offset="0x10CF0"/>
+        <Limb Name="object_zl2_010CFC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010CFC" Offset="0x10CFC"/>
+        <Limb Name="object_zl2_010D08_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010D08" Offset="0x10D08"/>
+        <Limb Name="object_zl2_010D14_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010D14" Offset="0x10D14"/>
+        <Limb Name="object_zl2_010D20_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010D20" Offset="0x10D20"/>
+        <Limb Name="object_zl2_010D2C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL2_010D2C" Offset="0x10D2C"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml
index 99cc12ea2a..8e057041e0 100644
--- a/assets/xml/objects/object_zl4.xml
+++ b/assets/xml/objects/object_zl4.xml
@@ -58,5 +58,68 @@
         <!-- Child Zelda's cutscene DLists (used by EnViewer)-->
         <DList Name="gChildZeldaCutsceneDressDL" Offset="0xC410"/>
         <DList Name="gChildZeldaOcarinaOfTimeDL" Offset="0xDE08"/>
+
+        <Texture Name="object_zl4_000670_TLUT" Format="rgba16" Width="256" Height="1" Offset="0x670"/>
+        <Texture Name="object_zl4_000C70_Tex" Format="ci8" Width="8" Height="8" Offset="0xC70" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_000CB0_Tex" Format="ci8" Width="16" Height="16" Offset="0xCB0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_000DB0_Tex" Format="ci8" Width="32" Height="64" Offset="0xDB0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_0015B0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x15B0"/>
+        <Texture Name="object_zl4_001630_Tex" Format="rgba16" Width="8" Height="8" Offset="0x1630"/>
+        <Texture Name="object_zl4_0016B0_Tex" Format="ci8" Width="32" Height="8" Offset="0x16B0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_0017B0_Tex" Format="ci8" Width="8" Height="8" Offset="0x17B0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_0017F0_Tex" Format="ci8" Width="32" Height="32" Offset="0x17F0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_001BF0_Tex" Format="rgba16" Width="8" Height="16" Offset="0x1BF0"/>
+        <Texture Name="object_zl4_001CF0_Tex" Format="ci8" Width="16" Height="16" Offset="0x1CF0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_001DF0_Tex" Format="ci8" Width="8" Height="8" Offset="0x1DF0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_001E30_Tex" Format="rgba16" Width="16" Height="32" Offset="0x1E30"/>
+        <Texture Name="object_zl4_002230_Tex" Format="ci8" Width="8" Height="8" Offset="0x2230" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_002270_Tex" Format="ci8" Width="8" Height="16" Offset="0x2270" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_0022F0_Tex" Format="ci8" Width="16" Height="32" Offset="0x22F0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_0024F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x24F0"/>
+        <Texture Name="object_zl4_0026F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x26F0"/>
+        <Texture Name="object_zl4_0028F0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x28F0"/>
+        <Texture Name="object_zl4_002970_Tex" Format="rgba16" Width="8" Height="8" Offset="0x2970"/>
+        <Texture Name="object_zl4_0029F0_Tex" Format="rgba16" Width="16" Height="8" Offset="0x29F0"/>
+        <Texture Name="object_zl4_0056F0_Tex" Format="rgba16" Width="16" Height="16" Offset="0x56F0"/>
+        <Texture Name="object_zl4_0058F0_Tex" Format="ci8" Width="16" Height="16" Offset="0x58F0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_0059F0_Tex" Format="rgba16" Width="8" Height="8" Offset="0x59F0"/>
+        <Texture Name="object_zl4_005A70_Tex" Format="rgba16" Width="16" Height="16" Offset="0x5A70"/>
+        <Texture Name="object_zl4_005C70_Tex" Format="ci8" Width="8" Height="8" Offset="0x5C70" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_005CB0_Tex" Format="ci8" Width="16" Height="16" Offset="0x5CB0" TlutOffset="0x670"/>
+        <Texture Name="object_zl4_005DB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x5DB0"/>
+        <DList Name="object_zl4_00A630_DL" Offset="0xA630"/>
+        <DList Name="object_zl4_00AFC8_DL" Offset="0xAFC8"/>
+        <DList Name="object_zl4_00B8D8_DL" Offset="0xB8D8"/>
+        <DList Name="object_zl4_00BB40_DL" Offset="0xBB40"/>
+        <DList Name="object_zl4_00BC90_DL" Offset="0xBC90"/>
+        <DList Name="object_zl4_00BE70_DL" Offset="0xBE70"/>
+        <DList Name="object_zl4_00C0E0_DL" Offset="0xC0E0"/>
+        <DList Name="object_zl4_00C230_DL" Offset="0xC230"/>
+        <DList Name="object_zl4_00C8D0_DL" Offset="0xC8D0"/>
+        <DList Name="object_zl4_00D0E8_DL" Offset="0xD0E8"/>
+        <DList Name="object_zl4_00D2A0_DL" Offset="0xD2A0"/>
+        <DList Name="object_zl4_00D460_DL" Offset="0xD460"/>
+        <DList Name="object_zl4_00D598_DL" Offset="0xD598"/>
+        <DList Name="object_zl4_00D5E8_DL" Offset="0xD5E8"/>
+        <DList Name="object_zl4_00D728_DL" Offset="0xD728"/>
+        <DList Name="object_zl4_00D778_DL" Offset="0xD778"/>
+        <Texture Name="object_zl4_00D8B8_Tex" Format="rgba16" Width="32" Height="16" Offset="0xD8B8"/>
+        <Limb Name="object_zl4_00DF28_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF28" Offset="0xDF28"/>
+        <Limb Name="object_zl4_00DF34_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF34" Offset="0xDF34"/>
+        <Limb Name="object_zl4_00DF40_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF40" Offset="0xDF40"/>
+        <Limb Name="object_zl4_00DF4C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF4C" Offset="0xDF4C"/>
+        <Limb Name="object_zl4_00DF58_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF58" Offset="0xDF58"/>
+        <Limb Name="object_zl4_00DF64_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF64" Offset="0xDF64"/>
+        <Limb Name="object_zl4_00DF70_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF70" Offset="0xDF70"/>
+        <Limb Name="object_zl4_00DF7C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF7C" Offset="0xDF7C"/>
+        <Limb Name="object_zl4_00DF88_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF88" Offset="0xDF88"/>
+        <Limb Name="object_zl4_00DF94_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DF94" Offset="0xDF94"/>
+        <Limb Name="object_zl4_00DFA0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFA0" Offset="0xDFA0"/>
+        <Limb Name="object_zl4_00DFAC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFAC" Offset="0xDFAC"/>
+        <Limb Name="object_zl4_00DFB8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFB8" Offset="0xDFB8"/>
+        <Limb Name="object_zl4_00DFC4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFC4" Offset="0xDFC4"/>
+        <Limb Name="object_zl4_00DFD0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFD0" Offset="0xDFD0"/>
+        <Limb Name="object_zl4_00DFDC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFDC" Offset="0xDFDC"/>
+        <Limb Name="object_zl4_00DFE8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_ZL4_00DFE8" Offset="0xDFE8"/>
     </File>
 </Root>