From 39523baf8c52d59b8ca52832c22e70eadf518f8a Mon Sep 17 00:00:00 2001
From: Tom Overton <tom-overton@users.noreply.github.com>
Date: Sun, 10 Sep 2023 23:07:53 -0700
Subject: [PATCH] Add original asset names to all `object_i*` and `object_j*`
 files (#1365)

* Add original asset names to all `object_i*` and `object_j*` files

* Remove MM3D name from `object_ishi`; asset names that start with `zelda2_` almost certainly come from Grezzo.
---
 assets/xml/objects/object_ice_block.xml     | 14 ++---
 assets/xml/objects/object_icefloe.xml       |  4 +-
 assets/xml/objects/object_icicle.xml        |  4 +-
 assets/xml/objects/object_ik.xml            | 36 +++++------
 assets/xml/objects/object_ikana_obj.xml     | 66 ++++++++++-----------
 assets/xml/objects/object_ikn_demo.xml      | 66 ++++++++++-----------
 assets/xml/objects/object_ikninside_obj.xml | 36 +++++------
 assets/xml/objects/object_iknv_obj.xml      | 36 +++++------
 assets/xml/objects/object_in.xml            | 38 ++++++------
 assets/xml/objects/object_in2.xml           | 24 ++++----
 assets/xml/objects/object_js.xml            | 12 ++--
 assets/xml/objects/object_jso.xml           | 46 +++++++-------
 12 files changed, 191 insertions(+), 191 deletions(-)

diff --git a/assets/xml/objects/object_ice_block.xml b/assets/xml/objects/object_ice_block.xml
index dd25c06d56..4b5cd47d45 100644
--- a/assets/xml/objects/object_ice_block.xml
+++ b/assets/xml/objects/object_ice_block.xml
@@ -1,23 +1,23 @@
 <Root>
     <File Name="object_ice_block" Segment="6">
         <!-- IceArrow Freezes ChuChu into a Pushable/Climbable Cube block -->
-        <DList Name="gIceBlockCubeDL" Offset="0x1A0" />
-        <DList Name="gIceBlockCubeEndDL" Offset="0x310" />
+        <DList Name="gIceBlockCubeDL" Offset="0x1A0" /> <!-- Original name is "ic_block_modelT" -->
+        <DList Name="gIceBlockCubeEndDL" Offset="0x310" /> <!-- Original name is "ic_block_model" -->
         <!-- this TexAnim is for the cube surface -->
         <TextureAnimation Name="gIceBlockCubeSublimatingAirTexAnim" Offset="0x328" />
-        <Collision Name="gIceBlockCol" Offset="0x438" />
+        <Collision Name="gIceBlockCol" Offset="0x438" /> <!-- Original name is "ic_block_bgdatainfo" -->
 
         <!-- IceArrow Freezes Octarock into a floating Iceberg platform -->
-        <DList Name="gIceBlockIceBergDL" Offset="0x7F0" />
-        <DList Name="gIceBlockIceBergEndDL" Offset="0x9B8" />
+        <DList Name="gIceBlockIceBergDL" Offset="0x7F0" /> <!-- Original name is "ic_blockdai_modelT" -->
+        <DList Name="gIceBlockIceBergEndDL" Offset="0x9B8" /> <!-- Original name is "ic_blockdai_model" -->
         <!-- this TexAnim is for the iceberg surface -->
         <TextureAnimation Name="gIceBlockIceBergSublimatingAirTexAnim" Offset="0x9D0" />
 
         <!-- Shard of Ice thrown off of IceBlock (EffectEnIceBlock) -->
         <!--   IceArrow creates frozen block or platform, throws shards during growing animation -->
         <!-- too big to be a snow flake, more like thin block of ice, better described as "Chip", or "Shard" or "Plate" -->
-        <DList Name="gIceBlockShardEffectEndDL" Offset="0xA30" />
-        <DList Name="gIceBlockShardEffectDL" Offset="0xA38" />
+        <DList Name="gIceBlockShardEffectEndDL" Offset="0xA30" /> <!-- Original name is "ic_kakera_modelT" -->
+        <DList Name="gIceBlockShardEffectDL" Offset="0xA38" /> <!-- Original name is "ic_kakera_model" -->
 
         <!-- These two appear to be identical (but different hash) -->
         <!-- first is used in CubeDL and ShardDL -->
diff --git a/assets/xml/objects/object_icefloe.xml b/assets/xml/objects/object_icefloe.xml
index 2427052af9..0440fa4bb9 100644
--- a/assets/xml/objects/object_icefloe.xml
+++ b/assets/xml/objects/object_icefloe.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_icefloe" Segment="6">
-        <DList Name="gIcefloeIcePlatformDL" Offset="0x1E0" />
+        <DList Name="gIcefloeIcePlatformDL" Offset="0x1E0" /> <!-- Original name is "w_ice_model" -->
         <Texture Name="gIcefloePlatformTex" OutName="icefloe_iceplatform" Format="rgba16" Width="32" Height="32" Offset="0x2C8" />
-        <Collision Name="gIcefloePlatformCol" Offset="0xC90" />
+        <Collision Name="gIcefloePlatformCol" Offset="0xC90" /> <!-- Original name is "w_ice_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_icicle.xml b/assets/xml/objects/object_icicle.xml
index 4f7bab8a24..ac00004713 100644
--- a/assets/xml/objects/object_icicle.xml
+++ b/assets/xml/objects/object_icicle.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_icicle" Segment="6">
-        <DList Name="object_icicle_DL_0000D0" Offset="0xD0" />
-        <Collision Name="object_icicle_Colheader_000294" Offset="0x294" />
+        <DList Name="object_icicle_DL_0000D0" Offset="0xD0" /> <!-- Original name is "ice_turara_model" -->
+        <Collision Name="object_icicle_Colheader_000294" Offset="0x294" /> <!-- Original name is "ice_turara_bgdatainfo" -->
         <Texture Name="object_icicle_Tex_0002C0" OutName="tex_0002C0" Format="i8" Width="64" Height="64" Offset="0x2C0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml
index 352b824871..fcbb90620a 100644
--- a/assets/xml/objects/object_ik.xml
+++ b/assets/xml/objects/object_ik.xml
@@ -1,34 +1,34 @@
 <Root>
     <!-- This is the object for the Iron Knuckle Enemy -->
     <File Name="object_ik" Segment="6">
-        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0xCE8" />
-        <Animation Name="gIronKnuckleRecoverVerticalAttackAnim" Offset="0x15F8" />
-        <Animation Name="gIronKnuckleEndVerticalAttackAnim" Offset="0x1ABC" />
-        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x2484" />
-        <Animation Name="gIronKnuckleEndHorizontalAttackAnim" Offset="0x2E7C" />
-        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x367C" />
-        <Animation Name="gIronKnuckleBlockAnim" Offset="0x391C" />
-        <Animation Name="gIronKnuckleDeathAnim" Offset="0x4A04" />
-        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x5254" />
-        <Animation Name="gIronKnuckleRunAnim" Offset="0x57F4" />
-        <Animation Name="gIronKnuckleWalkAnim" Offset="0x6294" />
+        <Animation Name="gIronKnuckleVerticalAttackAnim" Offset="0xCE8" /> <!-- Original name is "ironknack_attackA" -->
+        <Animation Name="gIronKnuckleRecoverVerticalAttackAnim" Offset="0x15F8" /> <!-- Original name is "ironknack_attackA_end" -->
+        <Animation Name="gIronKnuckleEndVerticalAttackAnim" Offset="0x1ABC" /> <!-- Original name is "ironknack_attackA_hit" -->
+        <Animation Name="gIronKnuckleHorizontalAttackAnim" Offset="0x2484" /> <!-- Original name is "ironknack_attackB" -->
+        <Animation Name="gIronKnuckleEndHorizontalAttackAnim" Offset="0x2E7C" /> <!-- Original name is "ironknack_attackB_end" -->
+        <Animation Name="gIronKnuckleBackHitAnim" Offset="0x367C" /> <!-- Original name is "ironknack_back_hit" -->
+        <Animation Name="gIronKnuckleBlockAnim" Offset="0x391C" /> <!-- Original name is "ironknack_defense" -->
+        <Animation Name="gIronKnuckleDeathAnim" Offset="0x4A04" /> <!-- Original name is "ironknack_down" -->
+        <Animation Name="gIronKnuckleFrontHitAnim" Offset="0x5254" /> <!-- Original name is "ironknack_front_hit" -->
+        <Animation Name="gIronKnuckleRunAnim" Offset="0x57F4" /> <!-- Original name is "ironknack_run" -->
+        <Animation Name="gIronKnuckleWalkAnim" Offset="0x6294" /> <!-- Original name is "ironknack_walk" -->
         <Array Name="gObjectIkVtx_009740" Count="566" Offset="0x6730">
             <Vtx/>
         </Array>
-        <DList Name="gIronKnuckleArmorFrontDL" Offset="0x9A40" />
-        <DList Name="gIronKnuckleArmorBackDL" Offset="0x9BC8" />
+        <DList Name="gIronKnuckleArmorFrontDL" Offset="0x9A40" /> <!-- Original name is "ironknack_front_armer" -->
+        <DList Name="gIronKnuckleArmorBackDL" Offset="0x9BC8" /> <!-- Original name is "ironknack_back_armer" -->
         <DList Name="gIronKnuckleAxeDL" Offset="0x9D20" />
         <DList Name="gIronKnuckleRightHandDL" Offset="0x9FD8" />
-        <DList Name="gIronKnuckleLowerRightPauldronDL" Offset="0xA130" />
+        <DList Name="gIronKnuckleLowerRightPauldronDL" Offset="0xA130" /> <!-- Original name is "ironknack_Rshoulder_b" -->
         <DList Name="gIronKnuckleLeftHandDL" Offset="0xA1F0" />
-        <DList Name="gIronKnuckleLowerLeftPauldronDL" Offset="0xA348" />
-        <DList Name="gIronKnuckleUpperRightPauldronDL" Offset="0xA408" />
-        <DList Name="gIronKnuckleUpperLeftPauldronDL" Offset="0xA4F0" />
+        <DList Name="gIronKnuckleLowerLeftPauldronDL" Offset="0xA348" /> <!-- Original name is "ironknack_Lshoulder_b" -->
+        <DList Name="gIronKnuckleUpperRightPauldronDL" Offset="0xA408" /> <!-- Original name is "ironknack_Rshoulder" -->
+        <DList Name="gIronKnuckleUpperLeftPauldronDL" Offset="0xA4F0" /> <!-- Original name is "ironknack_Lshoulder" -->
         <DList Name="gIronKnuckleFrontTorsoArmorMarkingDL" Offset="0xA5D8" />
         <DList Name="gIronKnuckleRearTorsoArmorMarkingDL" Offset="0xA6D0" />
         <DList Name="gIronKnuckleRivetsMarking1DL" Offset="0xA780" />
         <DList Name="gIronKnuckleRivetsMarking2DL" Offset="0xA820" />
-        <DList Name="gIronKnuckleBasMarkingDL" Offset="0xBF80" />
+        <DList Name="gIronKnuckleBasMarkingDL" Offset="0xBF80" /> <!-- Original name is "ironknack_head" -->
         <DList Name="gIronKnuckleGerudoHeadDL" Offset="0xC200" />
         <DList Name="gIronKnuckleHelmetMarkingDL" Offset="0xCF08" />
         <DList Name="gIronKnuckleTanArmorMaterialDL" Offset="0xD038" />
diff --git a/assets/xml/objects/object_ikana_obj.xml b/assets/xml/objects/object_ikana_obj.xml
index e0490a3495..0b67e7757a 100644
--- a/assets/xml/objects/object_ikana_obj.xml
+++ b/assets/xml/objects/object_ikana_obj.xml
@@ -1,38 +1,38 @@
 <Root>
     <File Name="object_ikana_obj" Segment="6">
-        <DList Name="object_ikana_obj_DL_000040" Offset="0x40" />
-        <DList Name="object_ikana_obj_DL_000048" Offset="0x48" />
-        <Collision Name="object_ikana_obj_Colheader_000128" Offset="0x128" />
-        <DList Name="object_ikana_obj_DL_000280" Offset="0x280" />
-        <DList Name="object_ikana_obj_DL_000288" Offset="0x288" />
-        <DList Name="object_ikana_obj_DL_000370" Offset="0x370" />
-        <DList Name="object_ikana_obj_DL_000378" Offset="0x378" />
-        <Collision Name="object_ikana_obj_Colheader_000488" Offset="0x488" />
-        <DList Name="object_ikana_obj_DL_0008C0" Offset="0x8C0" />
-        <DList Name="gStoneTowerTemplePunchablePillarDL" Offset="0x8C8" />
-        <Collision Name="gStoneTowerTemplePunchablePillarCol" Offset="0xC50" />
-        <DList Name="object_ikana_obj_DL_000CE0" Offset="0xCE0" />
-        <DList Name="object_ikana_obj_DL_000CE8" Offset="0xCE8" />
-        <Collision Name="object_ikana_obj_Colheader_000F28" Offset="0xF28" />
-        <DList Name="object_ikana_obj_DL_001100" Offset="0x1100" />
-        <DList Name="object_ikana_obj_DL_001210" Offset="0x1210" />
+        <DList Name="object_ikana_obj_DL_000040" Offset="0x40" /> <!-- Original name is "m2_IKA_BOMBfl_modelT" -->
+        <DList Name="object_ikana_obj_DL_000048" Offset="0x48" /> <!-- Original name is "m2_IKA_BOMBfl_model" -->
+        <Collision Name="object_ikana_obj_Colheader_000128" Offset="0x128" /> <!-- Original name is "m2_IKA_BOMBfl_bgdatainfo" -->
+        <DList Name="object_ikana_obj_DL_000280" Offset="0x280" /> <!-- Original name is "m2_IKA_BOMBhahen_modelT" -->
+        <DList Name="object_ikana_obj_DL_000288" Offset="0x288" /> <!-- Original name is "m2_IKA_BOMBhahen_model" -->
+        <DList Name="object_ikana_obj_DL_000370" Offset="0x370" /> <!-- Original name is "m2_IKA_BOMBwall_modelT" -->
+        <DList Name="object_ikana_obj_DL_000378" Offset="0x378" /> <!-- Original name is "m2_IKA_BOMBwall_model" -->
+        <Collision Name="object_ikana_obj_Colheader_000488" Offset="0x488" /> <!-- Original name is "m2_IKA_BOMBwall_bgdatainfo" -->
+        <DList Name="object_ikana_obj_DL_0008C0" Offset="0x8C0" /> <!-- Original name is "m2_IKA_Dalma_modelT" -->
+        <DList Name="gStoneTowerTemplePunchablePillarDL" Offset="0x8C8" /> <!-- Original name is "m2_IKA_Dalma_model" -->
+        <Collision Name="gStoneTowerTemplePunchablePillarCol" Offset="0xC50" /> <!-- Original name is "m2_IKA_Dalma_bgdatainfo" -->
+        <DList Name="object_ikana_obj_DL_000CE0" Offset="0xCE0" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_KOUSI_modelT" based on the rest of this object. -->
+        <DList Name="object_ikana_obj_DL_000CE8" Offset="0xCE8" /> <!-- Original name is "m2_IKA_KOUSI_model" -->
+        <Collision Name="object_ikana_obj_Colheader_000F28" Offset="0xF28" /> <!-- Original name is "m2_IKA_KOUSI_bgdatainfo" -->
+        <DList Name="object_ikana_obj_DL_001100" Offset="0x1100" /> <!-- Original name is "m2_IKA_LIGHT_modelT" -->
+        <DList Name="object_ikana_obj_DL_001210" Offset="0x1210" /> <!-- Original name is "m2_IKA_LIGHT_model" -->
         <TextureAnimation Name="object_ikana_obj_Matanimheader_001228" Offset="0x1228" />
-        <DList Name="gStoneTowerTempleMirrorLightAbsorptionDL" Offset="0x14B0" />
-        <DList Name="object_ikana_obj_DL_001660" Offset="0x1660" />
+        <DList Name="gStoneTowerTempleMirrorLightAbsorptionDL" Offset="0x14B0" /> <!-- Original name is "m2_IKA_MRin_modelT" -->
+        <DList Name="object_ikana_obj_DL_001660" Offset="0x1660" /> <!-- Original name is "m2_IKA_MRin_model" -->
         <TextureAnimation Name="gStoneTowerTempleMirrorLightAbsorptionTexAnim" Offset="0x1678" />
-        <DList Name="gStoneTowerTempleMirrorLightEmissionDL" Offset="0x1880" />
-        <DList Name="object_ikana_obj_DL_001AC0" Offset="0x1AC0" />
+        <DList Name="gStoneTowerTempleMirrorLightEmissionDL" Offset="0x1880" /> <!-- Original name is "m2_IKA_MRout_modelT" -->
+        <DList Name="object_ikana_obj_DL_001AC0" Offset="0x1AC0" /> <!-- Original name is "m2_IKA_MRout_model" -->
         <TextureAnimation Name="gStoneTowerTempleMirrorLightEmissionTexAnim" Offset="0x1AD8" />
-        <DList Name="object_ikana_obj_DL_001E10" Offset="0x1E10" />
-        <DList Name="gStoneTowerTempleMirrorDL" Offset="0x1E18" />
-        <Collision Name="gStoneTowerTempleMirrorCol" Offset="0x2358" />
-        <DList Name="object_ikana_obj_DL_004710" Offset="0x4710" />
-        <DList Name="object_ikana_obj_DL_0048A0" Offset="0x48A0" />
-        <Collision Name="object_ikana_obj_Colheader_006368" Offset="0x6368" />
-        <DList Name="object_ikana_obj_DL_007360" Offset="0x7360" />
-        <DList Name="object_ikana_obj_DL_007448" Offset="0x7448" />
+        <DList Name="object_ikana_obj_DL_001E10" Offset="0x1E10" /> <!-- Original name is "m2_IKA_Mirror_modelT" -->
+        <DList Name="gStoneTowerTempleMirrorDL" Offset="0x1E18" /> <!-- Original name is "m2_IKA_Mirror_model" -->
+        <Collision Name="gStoneTowerTempleMirrorCol" Offset="0x2358" /> <!-- Original name is "m2_IKA_Mirror_bgdatainfo" -->
+        <DList Name="object_ikana_obj_DL_004710" Offset="0x4710" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_room05_modelT" based on the rest of this object. -->
+        <DList Name="object_ikana_obj_DL_0048A0" Offset="0x48A0" /> <!-- Original name is "m2_IKA_room05_model" -->
+        <Collision Name="object_ikana_obj_Colheader_006368" Offset="0x6368" /> <!-- Original name is "m2_IKA_room05_bgdatainfo" -->
+        <DList Name="object_ikana_obj_DL_007360" Offset="0x7360" /> <!-- Not present in MM3D, but it was probably named "m2_IKA_room06_modelT" based on the rest of this object. -->
+        <DList Name="object_ikana_obj_DL_007448" Offset="0x7448" /> <!-- Original name is "m2_IKA_room06_model" -->
         <TextureAnimation Name="object_ikana_obj_Matanimheader_007B68" Offset="0x7B68" />
-        <Collision Name="object_ikana_obj_Colheader_0084F8" Offset="0x84F8" />
+        <Collision Name="object_ikana_obj_Colheader_0084F8" Offset="0x84F8" /> <!-- Original name is "m2_IKA_room06_bgdatainfo" -->
         <Texture Name="object_ikana_obj_TLUT_008530" OutName="tlut_008530" Format="rgba16" Width="4" Height="4" Offset="0x8530" />
         <!-- <Blob Name="object_ikana_obj_Blob_008550" Size="0x40" Offset="0x8550" /> -->
         <Texture Name="object_ikana_obj_TLUT_008590" OutName="tlut_008590" Format="rgba16" Width="4" Height="4" Offset="0x8590" />
@@ -58,10 +58,10 @@
         <Texture Name="gStoneTowerEmblemFrameTex" OutName="stone_tower_temple_emblem_frame" Format="ia8" Width="32" Height="64" Offset="0x109B0" />
         <Texture Name="object_ikana_obj_Tex_0111B0" OutName="tex_0111B0" Format="rgba16" Width="32" Height="32" Offset="0x111B0" />
         <Texture Name="object_ikana_obj_Tex_0119B0" OutName="tex_0119B0" Format="rgba16" Width="32" Height="32" Offset="0x119B0" />
-        <DList Name="object_ikana_obj_DL_012B70" Offset="0x12B70" />
-        <DList Name="object_ikana_obj_DL_013EA0" Offset="0x13EA0" />
-        <DList Name="object_ikana_obj_DL_013EA8" Offset="0x13EA8" />
-        <DList Name="object_ikana_obj_DL_014A40" Offset="0x14A40" />
+        <DList Name="object_ikana_obj_DL_012B70" Offset="0x12B70" /> <!-- Original name is probably "m2_IKA_RASENsita_model" (the model is just a green cube in MM3D) -->
+        <DList Name="object_ikana_obj_DL_013EA0" Offset="0x13EA0" /> <!-- Original name is probably "m2_IKA_RASENue_modelT" (the model is just a green cube in MM3D) -->
+        <DList Name="object_ikana_obj_DL_013EA8" Offset="0x13EA8" /> <!-- Original name is probably "m2_IKA_RASENue_model" (the model is just a green cube in MM3D) -->
+        <DList Name="object_ikana_obj_DL_014A40" Offset="0x14A40" /> <!-- Original name is "m2_IKA_shutter_model" -->
         <Texture Name="object_ikana_obj_Tex_014BA0" OutName="tex_014BA0" Format="rgba16" Width="32" Height="64" Offset="0x14BA0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ikn_demo.xml b/assets/xml/objects/object_ikn_demo.xml
index 53d5c65a11..bbb803499e 100644
--- a/assets/xml/objects/object_ikn_demo.xml
+++ b/assets/xml/objects/object_ikn_demo.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_ikn_demo" Segment="6">
         <!-- <Blob Name="object_ikn_demo_Blob_000000" Size="0x10" Offset="0x0" /> -->
-        <Animation Name="object_ikn_demo_Anim_0000B8" Offset="0xB8" />
+        <Animation Name="object_ikn_demo_Anim_0000B8" Offset="0xB8" /> <!-- Original name is "osk_default" -->
         <DList Name="object_ikn_demo_DL_001D20" Offset="0x1D20" />
         <DList Name="object_ikn_demo_DL_002128" Offset="0x2128" />
         <DList Name="object_ikn_demo_DL_002208" Offset="0x2208" />
@@ -44,13 +44,13 @@
         <Limb Name="object_ikn_demo_Standardlimb_003898" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0F" Offset="0x3898" />
         <Limb Name="object_ikn_demo_Standardlimb_0038A4" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_10" Offset="0x38A4" />
         <Skeleton Name="object_ikn_demo_Skel_0038F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_1_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_1_LIMB_MAX" EnumName="ObjectIknDemo1Limb" Offset="0x38F0" />
-        <Animation Name="object_ikn_demo_Anim_003CAC" Offset="0x3CAC" />
-        <Animation Name="object_ikn_demo_Anim_004208" Offset="0x4208" />
-        <Animation Name="object_ikn_demo_Anim_004514" Offset="0x4514" />
-        <Animation Name="object_ikn_demo_Anim_004A58" Offset="0x4A58" />
-        <Animation Name="object_ikn_demo_Anim_0065D8" Offset="0x65D8" />
-        <Animation Name="object_ikn_demo_Anim_0067B8" Offset="0x67B8" />
-        <Animation Name="object_ikn_demo_Anim_006808" Offset="0x6808" />
+        <Animation Name="object_ikn_demo_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "osk_hanasu_loop" -->
+        <Animation Name="object_ikn_demo_Anim_004208" Offset="0x4208" /> <!-- Original name is "osk_hanasu_wait" -->
+        <Animation Name="object_ikn_demo_Anim_004514" Offset="0x4514" /> <!-- Original name is "osk_okoru_loop" -->
+        <Animation Name="object_ikn_demo_Anim_004A58" Offset="0x4A58" /> <!-- Original name is "osk_okoru_wait" -->
+        <Animation Name="object_ikn_demo_Anim_0065D8" Offset="0x65D8" /> <!-- Original name is "osk_utau_loop" -->
+        <Animation Name="object_ikn_demo_Anim_0067B8" Offset="0x67B8" /> <!-- Original name is "sk1_bibiru_loop" -->
+        <Animation Name="object_ikn_demo_Anim_006808" Offset="0x6808" /> <!-- Original name is "sk1_default" -->
         <DList Name="object_ikn_demo_DL_0072F0" Offset="0x72F0" />
         <DList Name="object_ikn_demo_DL_007680" Offset="0x7680" />
         <DList Name="object_ikn_demo_DL_0077B0" Offset="0x77B0" />
@@ -64,19 +64,19 @@
         <Limb Name="object_ikn_demo_Standardlimb_007B18" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_05" Offset="0x7B18" />
         <Limb Name="object_ikn_demo_Standardlimb_007B24" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_06" Offset="0x7B24" />
         <Skeleton Name="object_ikn_demo_Skel_007B48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_2_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_2_LIMB_MAX" EnumName="ObjectIknDemo2Limb" Offset="0x7B48" />
-        <Animation Name="object_ikn_demo_Anim_0081A8" Offset="0x81A8" />
-        <Animation Name="object_ikn_demo_Anim_0083F4" Offset="0x83F4" />
-        <Animation Name="object_ikn_demo_Anim_008724" Offset="0x8724" />
-        <Animation Name="object_ikn_demo_Anim_008AF4" Offset="0x8AF4" />
-        <Animation Name="object_ikn_demo_Anim_008CEC" Offset="0x8CEC" />
-        <Animation Name="object_ikn_demo_Anim_008F1C" Offset="0x8F1C" />
-        <Animation Name="object_ikn_demo_Anim_009044" Offset="0x9044" />
-        <Animation Name="object_ikn_demo_Anim_009254" Offset="0x9254" />
-        <Animation Name="object_ikn_demo_Anim_0098E4" Offset="0x98E4" />
-        <Animation Name="object_ikn_demo_Anim_009A44" Offset="0x9A44" />
-        <Animation Name="object_ikn_demo_Anim_009CC8" Offset="0x9CC8" />
-        <Animation Name="object_ikn_demo_Anim_009EA8" Offset="0x9EA8" />
-        <Animation Name="object_ikn_demo_Anim_009F00" Offset="0x9F00" />
+        <Animation Name="object_ikn_demo_Anim_0081A8" Offset="0x81A8" /> <!-- Original name is "sk1_hajikareru" -->
+        <Animation Name="object_ikn_demo_Anim_0083F4" Offset="0x83F4" /> <!-- Original name is "sk1_hajikareru_loop" -->
+        <Animation Name="object_ikn_demo_Anim_008724" Offset="0x8724" /> <!-- Original name is "sk1_hebo" -->
+        <Animation Name="object_ikn_demo_Anim_008AF4" Offset="0x8AF4" /> <!-- Original name is "sk1_hebo_loop" -->
+        <Animation Name="object_ikn_demo_Anim_008CEC" Offset="0x8CEC" /> <!-- Original name is "sk1_odoroku" -->
+        <Animation Name="object_ikn_demo_Anim_008F1C" Offset="0x8F1C" /> <!-- Original name is "sk1_odoroku_loop" -->
+        <Animation Name="object_ikn_demo_Anim_009044" Offset="0x9044" /> <!-- Original name is "sk1_sagaru" -->
+        <Animation Name="object_ikn_demo_Anim_009254" Offset="0x9254" /> <!-- Original name is "sk1_sagaru_loop" -->
+        <Animation Name="object_ikn_demo_Anim_0098E4" Offset="0x98E4" /> <!-- Original name is "sk1_syutugen_loop" -->
+        <Animation Name="object_ikn_demo_Anim_009A44" Offset="0x9A44" /> <!-- Original name is "sk1_warau" -->
+        <Animation Name="object_ikn_demo_Anim_009CC8" Offset="0x9CC8" /> <!-- Original name is "sk1_warau_loop" -->
+        <Animation Name="object_ikn_demo_Anim_009EA8" Offset="0x9EA8" /> <!-- Original name is "sk2_bibiru_loop" -->
+        <Animation Name="object_ikn_demo_Anim_009F00" Offset="0x9F00" /> <!-- Original name is "sk2_default" -->
         <DList Name="object_ikn_demo_DL_00AB80" Offset="0xAB80" />
         <DList Name="object_ikn_demo_DL_00AEA0" Offset="0xAEA0" />
         <DList Name="object_ikn_demo_DL_00B028" Offset="0xB028" />
@@ -90,18 +90,18 @@
         <Limb Name="object_ikn_demo_Standardlimb_00B460" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_05" Offset="0xB460" />
         <Limb Name="object_ikn_demo_Standardlimb_00B46C" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_06" Offset="0xB46C" />
         <Skeleton Name="object_ikn_demo_Skel_00B490" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_3_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_3_LIMB_MAX" EnumName="ObjectIknDemo3Limb" Offset="0xB490" />
-        <Animation Name="object_ikn_demo_Anim_00B704" Offset="0xB704" />
-        <Animation Name="object_ikn_demo_Anim_00B8C0" Offset="0xB8C0" />
-        <Animation Name="object_ikn_demo_Anim_00B9E4" Offset="0xB9E4" />
-        <Animation Name="object_ikn_demo_Anim_00BDB4" Offset="0xBDB4" />
-        <Animation Name="object_ikn_demo_Anim_00BF04" Offset="0xBF04" />
-        <Animation Name="object_ikn_demo_Anim_00C154" Offset="0xC154" />
-        <Animation Name="object_ikn_demo_Anim_00C2C4" Offset="0xC2C4" />
-        <Animation Name="object_ikn_demo_Anim_00C59C" Offset="0xC59C" />
-        <Animation Name="object_ikn_demo_Anim_00C804" Offset="0xC804" />
-        <Animation Name="object_ikn_demo_Anim_00CA74" Offset="0xCA74" />
-        <Animation Name="object_ikn_demo_Anim_00CD28" Offset="0xCD28" />
-        <Animation Name="object_ikn_demo_Anim_00D044" Offset="0xD044" />
+        <Animation Name="object_ikn_demo_Anim_00B704" Offset="0xB704" /> <!-- Original name is "sk2_hajiku" -->
+        <Animation Name="object_ikn_demo_Anim_00B8C0" Offset="0xB8C0" /> <!-- Original name is "sk2_hajiku_loop" -->
+        <Animation Name="object_ikn_demo_Anim_00B9E4" Offset="0xB9E4" /> <!-- Original name is "sk2_hiku" -->
+        <Animation Name="object_ikn_demo_Anim_00BDB4" Offset="0xBDB4" /> <!-- Original name is "sk2_hiku_loop" -->
+        <Animation Name="object_ikn_demo_Anim_00BF04" Offset="0xBF04" /> <!-- Original name is "sk2_maee" -->
+        <Animation Name="object_ikn_demo_Anim_00C154" Offset="0xC154" /> <!-- Original name is "sk2_maee_loop" -->
+        <Animation Name="object_ikn_demo_Anim_00C2C4" Offset="0xC2C4" /> <!-- Original name is "sk2_muu" -->
+        <Animation Name="object_ikn_demo_Anim_00C59C" Offset="0xC59C" /> <!-- Original name is "sk2_muu_loop" -->
+        <Animation Name="object_ikn_demo_Anim_00C804" Offset="0xC804" /> <!-- Original name is "sk2_nani" -->
+        <Animation Name="object_ikn_demo_Anim_00CA74" Offset="0xCA74" /> <!-- Original name is "sk2_nani_loop" -->
+        <Animation Name="object_ikn_demo_Anim_00CD28" Offset="0xCD28" /> <!-- Original name is "sk2_odoroku" -->
+        <Animation Name="object_ikn_demo_Anim_00D044" Offset="0xD044" /> <!-- Original name is "sk2_odoroku_loop' "-->
         <Texture Name="object_ikn_demo_Tex_00D060" OutName="tex_00D060" Format="rgba16" Width="8" Height="8" Offset="0xD060" />
         <!-- <Blob Name="object_ikn_demo_Blob_00D0E0" Size="0x100" Offset="0xD0E0" /> -->
         <Texture Name="object_ikn_demo_Tex_00D1E0" OutName="tex_00D1E0" Format="rgba16" Width="16" Height="16" Offset="0xD1E0" />
diff --git a/assets/xml/objects/object_ikninside_obj.xml b/assets/xml/objects/object_ikninside_obj.xml
index 98ae6d34f0..26d1e12069 100644
--- a/assets/xml/objects/object_ikninside_obj.xml
+++ b/assets/xml/objects/object_ikninside_obj.xml
@@ -1,15 +1,15 @@
 <Root>
     <File Name="object_ikninside_obj" Segment="6">
-        <DList Name="object_ikninside_obj_DL_000590" Offset="0x590" />
-        <DList Name="object_ikninside_obj_DL_000EA0" Offset="0xEA0" />
+        <DList Name="object_ikninside_obj_DL_000590" Offset="0x590" /> <!-- Original name is "w2_RASENsite_model" -->
+        <DList Name="object_ikninside_obj_DL_000EA0" Offset="0xEA0" /> <!-- Original name is "w2_RASENue_model" -->
         <Texture Name="object_ikninside_obj_Tex_001120" OutName="tex_001120" Format="rgba16" Width="32" Height="64" Offset="0x1120" />
         <Texture Name="object_ikninside_obj_Tex_002120" OutName="tex_002120" Format="rgba16" Width="32" Height="64" Offset="0x2120" />
         <Texture Name="object_ikninside_obj_Tex_003120" OutName="tex_003120" Format="rgba16" Width="32" Height="64" Offset="0x3120" />
-        <DList Name="object_ikninside_obj_DL_004440" Offset="0x4440" />
+        <DList Name="object_ikninside_obj_DL_004440" Offset="0x4440" /> <!-- Original name is "w2_ikn_marutobira_model" -->
         <Texture Name="object_ikninside_obj_TLUT_004620" OutName="tlut_004620" Format="rgba16" Width="16" Height="16" Offset="0x4620" />
         <Texture Name="object_ikninside_obj_Tex_004820" OutName="tex_004820" Format="ci8" Width="32" Height="64" Offset="0x4820" />
         <Texture Name="object_ikninside_obj_Tex_005020" OutName="tex_005020" Format="ci8" Width="16" Height="32" Offset="0x5020" />
-        <DList Name="object_ikninside_obj_DL_005260" Offset="0x5260" />
+        <DList Name="object_ikninside_obj_DL_005260" Offset="0x5260" /> <!-- Original name is "w2_ikn_zenetu_model" -->
         <Texture Name="object_ikninside_obj_Tex_0052F0" OutName="tex_0052F0" Format="ia16" Width="16" Height="64" Offset="0x52F0" />
         <!-- <Blob Name="object_ikninside_obj_Blob_005AF0" Size="0x220" Offset="0x5AF0" /> -->
         <Texture Name="object_ikninside_obj_Tex_005D10" OutName="tex_005D10" Format="ia16" Width="32" Height="32" Offset="0x5D10" />
@@ -22,27 +22,27 @@
         <Texture Name="object_ikninside_obj_Tex_008D30" OutName="tex_008D30" Format="rgba16" Width="32" Height="32" Offset="0x8D30" />
         <Texture Name="object_ikninside_obj_Tex_009530" OutName="tex_009530" Format="rgba16" Width="16" Height="64" Offset="0x9530" />
         <Texture Name="object_ikninside_obj_Tex_009D30" OutName="tex_009D30" Format="rgba16" Width="32" Height="32" Offset="0x9D30" />
-        <DList Name="object_ikninside_obj_DL_00A5A0" Offset="0xA5A0" />
-        <DList Name="object_ikninside_obj_DL_00A5A8" Offset="0xA5A8" />
-        <DList Name="object_ikninside_obj_DL_00A740" Offset="0xA740" />
-        <DList Name="object_ikninside_obj_DL_00A748" Offset="0xA748" />
-        <DList Name="object_ikninside_obj_DL_00AB10" Offset="0xAB10" />
-        <DList Name="object_ikninside_obj_DL_00AD50" Offset="0xAD50" />
-        <DList Name="object_ikninside_obj_DL_00AEC0" Offset="0xAEC0" />
-        <DList Name="object_ikninside_obj_DL_00B0A8" Offset="0xB0A8" />
+        <DList Name="object_ikninside_obj_DL_00A5A0" Offset="0xA5A0" /> <!-- Original name is "w2_ikn_hahen_modelT" -->
+        <DList Name="object_ikninside_obj_DL_00A5A8" Offset="0xA5A8" /> <!-- Original name is "w2_ikn_hahen_model" -->
+        <DList Name="object_ikninside_obj_DL_00A740" Offset="0xA740" /> <!-- Original name is "w2_ikn_hahen2_modelT" -->
+        <DList Name="object_ikninside_obj_DL_00A748" Offset="0xA748" /> <!-- Original name is "w2_ikn_hahen2_model" -->
+        <DList Name="object_ikninside_obj_DL_00AB10" Offset="0xAB10" /> <!-- Original name is "w2_ikn_hikari_modelT" -->
+        <DList Name="object_ikninside_obj_DL_00AD50" Offset="0xAD50" /> <!-- Original name is "w2_ikn_hikari_model" -->
+        <DList Name="object_ikninside_obj_DL_00AEC0" Offset="0xAEC0" /> <!-- Original name is "w2_ikn_hikari2_modelT" -->
+        <DList Name="object_ikninside_obj_DL_00B0A8" Offset="0xB0A8" /> <!-- Original name is "w2_ikn_hikari2_model" -->
         <Texture Name="object_ikninside_obj_Tex_00B0B0" OutName="tex_00B0B0" Format="ia16" Width="32" Height="32" Offset="0xB0B0" />
         <Texture Name="object_ikninside_obj_Tex_00B8B0" OutName="tex_00B8B0" Format="ia16" Width="16" Height="32" Offset="0xB8B0" />
         <TextureAnimation Name="object_ikninside_obj_Matanimheader_00BCB8" Offset="0xBCB8" />
         <TextureAnimation Name="object_ikninside_obj_Matanimheader_00BCC8" Offset="0xBCC8" />
-        <DList Name="object_ikninside_obj_DL_00C300" Offset="0xC300" />
-        <DList Name="object_ikninside_obj_DL_00C308" Offset="0xC308" />
+        <DList Name="object_ikninside_obj_DL_00C300" Offset="0xC300" /> <!-- Original name is "w2_ikn_turitenjo_modelT" -->
+        <DList Name="object_ikninside_obj_DL_00C308" Offset="0xC308" /> <!-- Original name is "w2_ikn_turitenjo_model" -->
         <TextureAnimation Name="object_ikninside_obj_Matanimheader_00C670" Offset="0xC670" />
-        <Collision Name="object_ikninside_obj_Colheader_00CBAC" Offset="0xCBAC" />
-        <DList Name="object_ikninside_obj_DL_00CC70" Offset="0xCC70" />
-        <DList Name="object_ikninside_obj_DL_00CC78" Offset="0xCC78" />
+        <Collision Name="object_ikninside_obj_Colheader_00CBAC" Offset="0xCBAC" /> <!-- Original name is "w2_ikn_turitenjo_bgdatainfo" -->
+        <DList Name="object_ikninside_obj_DL_00CC70" Offset="0xCC70" /> <!-- Original name is "w2_ikn_yuka_modelT" -->
+        <DList Name="object_ikninside_obj_DL_00CC78" Offset="0xCC78" /> <!-- Original name is "w2_ikn_yuka_model" -->
         <Texture Name="object_ikninside_obj_Tex_00CD60" OutName="tex_00CD60" Format="rgba16" Width="16" Height="64" Offset="0xCD60" />
         <Texture Name="object_ikninside_obj_Tex_00D560" OutName="tex_00D560" Format="i4" Width="64" Height="64" Offset="0xD560" />
         <TextureAnimation Name="object_ikninside_obj_Matanimheader_00DD70" Offset="0xDD70" />
-        <Collision Name="object_ikninside_obj_Colheader_00DE48" Offset="0xDE48" />
+        <Collision Name="object_ikninside_obj_Colheader_00DE48" Offset="0xDE48" /> <!-- Original name is "w2_ikn_yuka_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_iknv_obj.xml b/assets/xml/objects/object_iknv_obj.xml
index 58926c0e35..5c54c71da4 100644
--- a/assets/xml/objects/object_iknv_obj.xml
+++ b/assets/xml/objects/object_iknv_obj.xml
@@ -24,19 +24,19 @@
         <Texture Name="object_iknv_obj_Tex_007360" OutName="tex_007360" Format="i8" Width="32" Height="64" Offset="0x7360" />
         <Texture Name="object_iknv_obj_Tex_007B60" OutName="tex_007B60" Format="rgba16" Width="32" Height="32" Offset="0x7B60" />
         <Texture Name="object_iknv_obj_Tex_008360" OutName="tex_008360" Format="i8" Width="32" Height="128" Offset="0x8360" />
-        <DList Name="object_iknv_obj_DL_00DB60" Offset="0xDB60" />
-        <DList Name="object_iknv_obj_DL_00DDD8" Offset="0xDDD8" />
+        <DList Name="object_iknv_obj_DL_00DB60" Offset="0xDB60" /> <!-- Original name is "z2_dokuana_modelT" -->
+        <DList Name="object_iknv_obj_DL_00DDD8" Offset="0xDDD8" /> <!-- Original name is "z2_dokuana_model" -->
         <TextureAnimation Name="object_iknv_obj_Matanimheader_00F1C0" Offset="0xF1C0" />
-        <DList Name="object_iknv_obj_DL_010D90" Offset="0x10D90" />
-        <DList Name="object_iknv_obj_DL_010D98" Offset="0x10D98" />
+        <DList Name="object_iknv_obj_DL_010D90" Offset="0x10D90" /> <!-- Original name is "z2_doukutu_modelT" -->
+        <DList Name="object_iknv_obj_DL_010D98" Offset="0x10D98" /> <!-- Original name is "z2_doukutu_model" -->
         <!-- <Blob Name="object_iknv_obj_Blob_0113E0" Size="0x10" Offset="0x113E0" /> -->
-        <DList Name="object_iknv_obj_DL_0115E0" Offset="0x115E0" />
-        <DList Name="object_iknv_obj_DL_011788" Offset="0x11788" />
+        <DList Name="object_iknv_obj_DL_0115E0" Offset="0x115E0" /> <!-- Original name is "z2_doumizu_modelT" -->
+        <DList Name="object_iknv_obj_DL_011788" Offset="0x11788" /> <!-- Original name is "z2_doumizu_model" -->
         <TextureAnimation Name="object_iknv_obj_Matanimheader_0117A0" Offset="0x117A0" />
-        <Collision Name="object_iknv_obj_Colheader_0117C8" Offset="0x117C8" />
-        <DList Name="object_iknv_obj_DL_011880" Offset="0x11880" />
-        <DList Name="object_iknv_obj_DL_011950" Offset="0x11950" />
-        <Collision Name="object_iknv_obj_Colheader_0119D4" Offset="0x119D4" />
+        <Collision Name="object_iknv_obj_Colheader_0117C8" Offset="0x117C8" /> <!-- Original name is "z2_doumizu_bgdatainfo" -->
+        <DList Name="object_iknv_obj_DL_011880" Offset="0x11880" /> <!-- Original name is "z2_ikiriguti_modelT" -->
+        <DList Name="object_iknv_obj_DL_011950" Offset="0x11950" /> <!-- Original name is "z2_ikiriguti_model" -->
+        <Collision Name="object_iknv_obj_Colheader_0119D4" Offset="0x119D4" /> <!-- Original name is "z2_ikiriguti_bgdatainfo" -->
         <DList Name="object_iknv_obj_DL_011E70" Offset="0x11E70" />
         <DList Name="object_iknv_obj_DL_011F40" Offset="0x11F40" />
         <DList Name="object_iknv_obj_DL_012020" Offset="0x12020" />
@@ -57,14 +57,14 @@
         <DList Name="object_iknv_obj_DL_012550" Offset="0x12550" />
         <DList Name="object_iknv_obj_DL_0125E0" Offset="0x125E0" />
         <DList Name="object_iknv_obj_DL_0126D0" Offset="0x126D0" />
-        <DList Name="object_iknv_obj_DL_012700" Offset="0x12700" />
+        <DList Name="object_iknv_obj_DL_012700" Offset="0x12700" /> <!-- Original name is "z2_ikkawa_modelT" -->
         <TextureAnimation Name="object_iknv_obj_Matanimheader_012728" Offset="0x12728" />
-        <Collision Name="object_iknv_obj_Colheader_012788" Offset="0x12788" />
-        <DList Name="object_iknv_obj_DL_012880" Offset="0x12880" />
-        <DList Name="object_iknv_obj_DL_0129C0" Offset="0x129C0" />
-        <DList Name="object_iknv_obj_DL_0129C8" Offset="0x129C8" />
-        <Collision Name="object_iknv_obj_Colheader_012CA4" Offset="0x12CA4" />
-        <DList Name="object_iknv_obj_DL_013050" Offset="0x13050" />
-        <DList Name="object_iknv_obj_DL_013058" Offset="0x13058" />
+        <Collision Name="object_iknv_obj_Colheader_012788" Offset="0x12788" /> <!-- Original name is "z2_ikkawa_bgdatainfo" -->
+        <DList Name="object_iknv_obj_DL_012880" Offset="0x12880" /> <!-- Original name is "z2_ikkawa_c_model" -->
+        <DList Name="object_iknv_obj_DL_0129C0" Offset="0x129C0" /> <!-- Not present in MM3D, but it was probably named "z2_iwado_model" based on the rest of this object. -->
+        <DList Name="object_iknv_obj_DL_0129C8" Offset="0x129C8" /> <!-- Original name is "z2_iwado_model" -->
+        <Collision Name="object_iknv_obj_Colheader_012CA4" Offset="0x12CA4" /> <!-- Original name is "z2_iwado_bgdatainfo" -->
+        <DList Name="object_iknv_obj_DL_013050" Offset="0x13050" /> <!-- Original name is "z2_suisya_modelT" -->
+        <DList Name="object_iknv_obj_DL_013058" Offset="0x13058" /> <!-- Original name is "z2_suisya_model" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 15b2382aa5..ee7ceb3a05 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -1,10 +1,10 @@
 <Root>
     <File Name="object_in" Segment="6">
-        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4" />
-        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0" />
-        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0" />
+        <Animation Name="object_in_Anim_0003B4" Offset="0x3B4" /> <!-- Original name is "in2_fusagu" -->
+        <Animation Name="object_in_Anim_000CB0" Offset="0xCB0" /> <!-- Original name is "in2_kachi" -->
+        <Animation Name="object_in_Anim_001BE0" Offset="0x1BE0" /> <!-- Original name is "in2_kuyasii" -->
         <TextureAnimation Name="object_in_Matanimheader_001C30" Offset="0x1C30" />
-        <Animation Name="object_in_Anim_001D10" Offset="0x1D10" />
+        <Animation Name="object_in_Anim_001D10" Offset="0x1D10" /> <!-- Original name is "in_matsu1" -->
         <!-- <Blob Name="object_in_Blob_001D20" Size="0x1738" Offset="0x1D20" /> -->
         <Texture Name="object_in_Tex_003520" OutName="tex_003520" Format="ci8" Width="8" Height="8" Offset="0x3520" />
         <Texture Name="object_in_Tex_0035E0" OutName="tex_0035E0" Format="ci8" Width="32" Height="32" Offset="0x35E0" />
@@ -113,21 +113,21 @@
         <Limb Name="object_in_Standardlimb_014E44" Type="Standard" EnumName="OBJECT_IN_LIMB_12" Offset="0x14E44" />
         <Limb Name="object_in_Standardlimb_014E50" Type="Standard" EnumName="OBJECT_IN_LIMB_13" Offset="0x14E50" />
         <Skeleton Name="object_in_Skel_014EA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN_LIMB_NONE" LimbMax="OBJECT_IN_LIMB_MAX" EnumName="ObjectInLimb" Offset="0x14EA8" />
-        <Animation Name="object_in_Anim_014F8C" Offset="0x14F8C" />
-        <Animation Name="object_in_Anim_015918" Offset="0x15918" />
-        <Animation Name="object_in_Anim_015E38" Offset="0x15E38" />
-        <Animation Name="object_in_Anim_016484" Offset="0x16484" />
-        <Animation Name="object_in_Anim_016A60" Offset="0x16A60" />
-        <Animation Name="object_in_Anim_0170DC" Offset="0x170DC" />
-        <Animation Name="object_in_Anim_0177AC" Offset="0x177AC" />
-        <Animation Name="object_in_Anim_018240" Offset="0x18240" />
-        <Animation Name="object_in_Anim_0187C8" Offset="0x187C8" />
-        <Animation Name="object_in_Anim_0198A8" Offset="0x198A8" />
-        <Animation Name="object_in_Anim_019EB4" Offset="0x19EB4" />
-        <Animation Name="object_in_Anim_01A140" Offset="0x1A140" />
-        <Animation Name="object_in_Anim_01B3C4" Offset="0x1B3C4" />
-        <Animation Name="object_in_Anim_01B904" Offset="0x1B904" />
-        <Animation Name="object_in_Anim_01C0B0" Offset="0x1C0B0" />
+        <Animation Name="object_in_Anim_014F8C" Offset="0x14F8C" /> <!-- Original name is "in_matsu2" -->
+        <Animation Name="object_in_Anim_015918" Offset="0x15918" /> <!-- Original name is "in_shigoto" -->
+        <Animation Name="object_in_Anim_015E38" Offset="0x15E38" /> <!-- Original name is "ingo_anim_fastrun" -->
+        <Animation Name="object_in_Anim_016484" Offset="0x16484" /> <!-- Original name is "ingo_anim_fastrun_muti" -->
+        <Animation Name="object_in_Anim_016A60" Offset="0x16A60" /> <!-- Original name is "ingo_anim_slowrun" -->
+        <Animation Name="object_in_Anim_0170DC" Offset="0x170DC" /> <!-- Original name is "ingo_anim_slowrun_muti" -->
+        <Animation Name="object_in_Anim_0177AC" Offset="0x177AC" /> <!-- Original name is "ingo_anim_stop" -->
+        <Animation Name="object_in_Anim_018240" Offset="0x18240" /> <!-- Original name is "ingo_anim_stop_muti" -->
+        <Animation Name="object_in_Anim_0187C8" Offset="0x187C8" /> <!-- Original name is "ingo_anim_wait1" -->
+        <Animation Name="object_in_Anim_0198A8" Offset="0x198A8" /> <!-- Original name is "ingo_anim_wait2" -->
+        <Animation Name="object_in_Anim_019EB4" Offset="0x19EB4" /> <!-- Original name is "ingo_jump" -->
+        <Animation Name="object_in_Anim_01A140" Offset="0x1A140" /> <!-- Original name is "ingo_run1" -->
+        <Animation Name="object_in_Anim_01B3C4" Offset="0x1B3C4" /> <!-- Original name is "ingo_tyakuti" -->
+        <Animation Name="object_in_Anim_01B904" Offset="0x1B904" /> <!-- Original name is "ingo_wait1" -->
+        <Animation Name="object_in_Anim_01C0B0" Offset="0x1C0B0" /> <!-- Original name is "ingo_walk_loop" -->
         <DList Name="object_in_DL_01C520" Offset="0x1C520" />
         <DList Name="object_in_DL_01C528" Offset="0x1C528" />
         <Texture Name="object_in_TLUT_01C8F0" OutName="tlut_01C8F0" Format="rgba16" Width="16" Height="16" Offset="0x1C8F0" />
diff --git a/assets/xml/objects/object_in2.xml b/assets/xml/objects/object_in2.xml
index bcd04091b4..e903185b4b 100644
--- a/assets/xml/objects/object_in2.xml
+++ b/assets/xml/objects/object_in2.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_in2" Segment="6">
-        <Animation Name="object_in2_Anim_000084" Offset="0x84" />
+        <Animation Name="object_in2_Anim_000084" Offset="0x84" /> <!-- Original name is "in2_kihon" -->
         <DList Name="object_in2_DL_002D60" Offset="0x2D60" />
         <DList Name="object_in2_DL_003060" Offset="0x3060" />
         <DList Name="object_in2_DL_0035B0" Offset="0x35B0" />
@@ -67,16 +67,16 @@
         <Limb Name="object_in2_Standardlimb_00784C" Type="Standard" EnumName="OBJECT_IN2_LIMB_12" Offset="0x784C" />
         <Limb Name="object_in2_Standardlimb_007858" Type="Standard" EnumName="OBJECT_IN2_LIMB_13" Offset="0x7858" />
         <Skeleton Name="object_in2_Skel_0078B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN2_LIMB_NONE" LimbMax="OBJECT_IN2_LIMB_MAX" EnumName="ObjectIn2Limb" Offset="0x78B0" />
-        <Animation Name="object_in2_Anim_008090" Offset="0x8090" />
-        <Animation Name="object_in2_Anim_00898C" Offset="0x898C" />
-        <Animation Name="object_in2_Anim_009450" Offset="0x9450" />
-        <Animation Name="object_in2_Anim_009CDC" Offset="0x9CDC" />
-        <Animation Name="object_in2_Anim_00A5E0" Offset="0xA5E0" />
-        <Animation Name="object_in2_Anim_00A70C" Offset="0xA70C" />
-        <Animation Name="object_in2_Anim_00AD18" Offset="0xAD18" />
-        <Animation Name="object_in2_Anim_00B8B0" Offset="0xB8B0" />
-        <Animation Name="object_in2_Anim_00B990" Offset="0xB990" />
-        <Animation Name="object_in2_Anim_00BA80" Offset="0xBA80" />
-        <Animation Name="object_in2_Anim_00C03C" Offset="0xC03C" />
+        <Animation Name="object_in2_Anim_008090" Offset="0x8090" /> <!-- Original name is "in2_suwarukard" -->
+        <Animation Name="object_in2_Anim_00898C" Offset="0x898C" /> <!-- Original name is "in2_suwarunomu" -->
+        <Animation Name="object_in2_Anim_009450" Offset="0x9450" /> <!-- Original name is "in2_suwaruokoru" -->
+        <Animation Name="object_in2_Anim_009CDC" Offset="0x9CDC" /> <!-- Original name is "in2_suwaruwait" -->
+        <Animation Name="object_in2_Anim_00A5E0" Offset="0xA5E0" /> <!-- Original name is "in2_suwaruwait2" -->
+        <Animation Name="object_in2_Anim_00A70C" Offset="0xA70C" /> <!-- Original name is "in2_suwaruwait3" -->
+        <Animation Name="object_in2_Anim_00AD18" Offset="0xAD18" /> <!-- Original name is "in2_walk" -->
+        <Animation Name="object_in2_Anim_00B8B0" Offset="0xB8B0" /> <!-- Original name is "in2_walk2suwaru" -->
+        <Animation Name="object_in2_Anim_00B990" Offset="0xB990" /> <!-- Original name is "in2_matsu1" -->
+        <Animation Name="object_in2_Anim_00BA80" Offset="0xBA80" /> <!-- Original name is "in_neru1" -->
+        <Animation Name="object_in2_Anim_00C03C" Offset="0xC03C" /> <!-- Original name is "in_pekopeko" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml
index 1335b8287f..6d93f7ac20 100644
--- a/assets/xml/objects/object_js.xml
+++ b/assets/xml/objects/object_js.xml
@@ -1,10 +1,10 @@
 <Root>
     <File Name="object_js" Segment="6">
-        <Animation Name="object_js_Anim_00016C" Offset="0x16C" />
-        <Animation Name="object_js_Anim_0003DC" Offset="0x3DC" />
-        <Animation Name="object_js_Anim_000AD4" Offset="0xAD4" />
-        <Animation Name="object_js_Anim_000C7C" Offset="0xC7C" />
-        <Animation Name="object_js_Anim_000F4C" Offset="0xF4C" />
+        <Animation Name="object_js_Anim_00016C" Offset="0x16C" /> <!-- Original name is "js_chigau" -->
+        <Animation Name="object_js_Anim_0003DC" Offset="0x3DC" /> <!-- Original name is "js_chigau2wait" -->
+        <Animation Name="object_js_Anim_000AD4" Offset="0xAD4" /> <!-- Original name is "js_furueru" -->
+        <Animation Name="object_js_Anim_000C7C" Offset="0xC7C" /> <!-- Original name is "js_maido" -->
+        <Animation Name="object_js_Anim_000F4C" Offset="0xF4C" /> <!-- Original name is "js_matsu" -->
         <DList Name="object_js_DL_003F30" Offset="0x3F30" />
         <DList Name="object_js_DL_004510" Offset="0x4510" />
         <DList Name="object_js_DL_004688" Offset="0x4688" />
@@ -40,6 +40,6 @@
         <Limb Name="object_js_Standardlimb_006948" Type="Standard" EnumName="OBJECT_JS_LIMB_0B" Offset="0x6948" />
         <Limb Name="object_js_Standardlimb_006954" Type="Standard" EnumName="OBJECT_JS_LIMB_0C" Offset="0x6954" />
         <Skeleton Name="object_js_Skel_006990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JS_LIMB_NONE" LimbMax="OBJECT_JS_LIMB_MAX" EnumName="ObjectJsLimb" Offset="0x6990" />
-        <Collision Name="object_js_Colheader_0069E8" Offset="0x69E8" />
+        <Collision Name="object_js_Colheader_0069E8" Offset="0x69E8" /> <!-- Original name is "test_floor_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_jso.xml b/assets/xml/objects/object_jso.xml
index a397311c45..bfe271d69b 100644
--- a/assets/xml/objects/object_jso.xml
+++ b/assets/xml/objects/object_jso.xml
@@ -50,26 +50,26 @@
         <Limb Name="object_jso_Standardlimb_003104" Type="Standard" EnumName="OBJECT_JSO_1_LIMB_12" Offset="0x3104" />
         <Limb Name="object_jso_Standardlimb_003110" Type="Standard" EnumName="OBJECT_JSO_1_LIMB_13" Offset="0x3110" />
         <Skeleton Name="object_jso_Skel_003168" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JSO_1_LIMB_NONE" LimbMax="OBJECT_JSO_1_LIMB_MAX" EnumName="ObjectJso1Limb" Offset="0x3168" />
-        <Animation Name="object_jso_Anim_003238" Offset="0x3238" />
-        <Animation Name="object_jso_Anim_003530" Offset="0x3530" />
-        <Animation Name="object_jso_Anim_00378C" Offset="0x378C" />
-        <Animation Name="object_jso_Anim_0038AC" Offset="0x38AC" />
-        <Animation Name="object_jso_Anim_003D5C" Offset="0x3D5C" />
-        <Animation Name="object_jso_Anim_004018" Offset="0x4018" />
-        <Animation Name="object_jso_Anim_004384" Offset="0x4384" />
-        <Animation Name="object_jso_Anim_0044F8" Offset="0x44F8" />
-        <Animation Name="object_jso_Anim_004858" Offset="0x4858" />
-        <Animation Name="object_jso_Anim_005778" Offset="0x5778" />
-        <Animation Name="object_jso_Anim_005D5C" Offset="0x5D5C" />
-        <Animation Name="object_jso_Anim_00603C" Offset="0x603C" />
-        <Animation Name="object_jso_Anim_0063A4" Offset="0x63A4" />
-        <Animation Name="object_jso_Anim_0067F0" Offset="0x67F0" />
-        <Animation Name="object_jso_Anim_0070BC" Offset="0x70BC" />
-        <Animation Name="object_jso_Anim_0071E0" Offset="0x71E0" />
-        <Animation Name="object_jso_Anim_0072AC" Offset="0x72AC" />
-        <Animation Name="object_jso_Anim_00788C" Offset="0x788C" />
-        <Animation Name="object_jso_Anim_007B04" Offset="0x7B04" />
-        <Animation Name="object_jso_Anim_0081F4" Offset="0x81F4" />
+        <Animation Name="object_jso_Anim_003238" Offset="0x3238" /> <!-- Original name is "jsk_pose" -->
+        <Animation Name="object_jso_Anim_003530" Offset="0x3530" /> <!-- Original name is "jso_attack1" -->
+        <Animation Name="object_jso_Anim_00378C" Offset="0x378C" /> <!-- Original name is "jso_attack2" -->
+        <Animation Name="object_jso_Anim_0038AC" Offset="0x38AC" /> <!-- Original name is "jso_attack_wait" -->
+        <Animation Name="object_jso_Anim_003D5C" Offset="0x3D5C" /> <!-- Original name is "jso_back" -->
+        <Animation Name="object_jso_Anim_004018" Offset="0x4018" /> <!-- Original name is "jso_bomb" -->
+        <Animation Name="object_jso_Anim_004384" Offset="0x4384" /> <!-- Original name is "jso_chakuchiD" -->
+        <Animation Name="object_jso_Anim_0044F8" Offset="0x44F8" /> <!-- Original name is "jso_damage" -->
+        <Animation Name="object_jso_Anim_004858" Offset="0x4858" /> <!-- Original name is "jso_defense" -->
+        <Animation Name="object_jso_Anim_005778" Offset="0x5778" /> <!-- Original name is "jso_demo_start" -->
+        <Animation Name="object_jso_Anim_005D5C" Offset="0x5D5C" /> <!-- Original name is "jso_down" -->
+        <Animation Name="object_jso_Anim_00603C" Offset="0x603C" /> <!-- Original name is "jso_hajiku" -->
+        <Animation Name="object_jso_Anim_0063A4" Offset="0x63A4" /> <!-- Original name is "jso_henahena" -->
+        <Animation Name="object_jso_Anim_0067F0" Offset="0x67F0" /> <!-- Original name is "jso_hetari" -->
+        <Animation Name="object_jso_Anim_0070BC" Offset="0x70BC" /> <!-- Original name is "jso_jakin" -->
+        <Animation Name="object_jso_Anim_0071E0" Offset="0x71E0" /> <!-- Original name is "jso_jumpD" -->
+        <Animation Name="object_jso_Anim_0072AC" Offset="0x72AC" /> <!-- Original name is "jso_kaiten" -->
+        <Animation Name="object_jso_Anim_00788C" Offset="0x788C" /> <!-- Original name is "jso_kyoro" -->
+        <Animation Name="object_jso_Anim_007B04" Offset="0x7B04" /> <!-- Original name is "jso_ororo" -->
+        <Animation Name="object_jso_Anim_0081F4" Offset="0x81F4" /> <!-- Original name is "jso_start" -->
         <DList Name="object_jso_DL_008F50" Offset="0x8F50" />
         <DList Name="object_jso_DL_009008" Offset="0x9008" />
         <DList Name="object_jso_DL_0090C0" Offset="0x90C0" />
@@ -115,8 +115,8 @@
         <Limb Name="object_jso_Standardlimb_00A99C" Type="Standard" EnumName="OBJECT_JSO_2_LIMB_12" Offset="0xA99C" />
         <Limb Name="object_jso_Standardlimb_00A9A8" Type="Standard" EnumName="OBJECT_JSO_2_LIMB_13" Offset="0xA9A8" />
         <Skeleton Name="object_jso_Skel_00AA00" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JSO_2_LIMB_NONE" LimbMax="OBJECT_JSO_2_LIMB_MAX" EnumName="ObjectJso2Limb" Offset="0xAA00" />
-        <Animation Name="object_jso_Anim_00AE80" Offset="0xAE80" />
-        <Animation Name="object_jso_Anim_00B1DC" Offset="0xB1DC" />
-        <Animation Name="object_jso_Anim_00B5F0" Offset="0xB5F0" />
+        <Animation Name="object_jso_Anim_00AE80" Offset="0xAE80" /> <!-- Original name is "jso_wait" -->
+        <Animation Name="object_jso_Anim_00B1DC" Offset="0xB1DC" /> <!-- Original name is "jso_waitD" -->
+        <Animation Name="object_jso_Anim_00B5F0" Offset="0xB5F0" /> <!-- Original name is "jso_walk" -->
     </File>
 </Root>