Assets: Move limb enums into xmls 3 (#2630)

4 files changed, 127 insertions, 127 deletions

diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 4530adc37..84bc84804 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -216,27 +216,27 @@
         <DList Name="gIngoAdultEraLeftLegDL" Offset="0x137C0"/>
         <DList Name="gIngoAdultEraLeftFootDL" Offset="0x13910"/>
 
-        <Limb Name="gIngoRootLimb" LimbType="Standard" Offset="0x13A58"/>
-        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" Offset="0x13A64"/>
-        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" Offset="0x13A70"/>
-        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" Offset="0x13A7C"/>
-        <Limb Name="gIngoRightThighLimb" LimbType="Standard" Offset="0x13A88"/>
-        <Limb Name="gIngoRightLegLimb" LimbType="Standard" Offset="0x13A94"/>
-        <Limb Name="gIngoRightFootLimb" LimbType="Standard" Offset="0x13AA0"/>
-        <Limb Name="gIngoTorsoLimb" LimbType="Standard" Offset="0x13AAC"/>
-        <Limb Name="gIngoChestLimb" LimbType="Standard" Offset="0x13AB8"/>
-        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" Offset="0x13AC4"/>
-        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" Offset="0x13AD0"/>
-        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" Offset="0x13ADC"/>
-        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" Offset="0x13AE8"/>
-        <Limb Name="gIngoRightArmLimb" LimbType="Standard" Offset="0x13AF4"/>
-        <Limb Name="gIngoRightHandLimb" LimbType="Standard" Offset="0x13B00"/>
-        <Limb Name="gIngoHeadLimb" LimbType="Standard" Offset="0x13B0C"/>
-        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" Offset="0x13B18"/>
-        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" Offset="0x13B24"/>
-        <Limb Name="gIngoMustacheLimb" LimbType="Standard" Offset="0x13B30"/>
+        <Limb Name="gIngoRootLimb" LimbType="Standard" EnumName="INGO_LIMB_ROOT" Offset="0x13A58"/>
+        <Limb Name="gIngoLeftThighLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_THIGH" Offset="0x13A64"/>
+        <Limb Name="gIngoLeftLegLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_LEG" Offset="0x13A70"/>
+        <Limb Name="gIngoLeftFootLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_FOOT" Offset="0x13A7C"/>
+        <Limb Name="gIngoRightThighLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_THIGH" Offset="0x13A88"/>
+        <Limb Name="gIngoRightLegLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_LEG" Offset="0x13A94"/>
+        <Limb Name="gIngoRightFootLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_FOOT" Offset="0x13AA0"/>
+        <Limb Name="gIngoTorsoLimb" LimbType="Standard" EnumName="INGO_LIMB_TORSO" Offset="0x13AAC"/>
+        <Limb Name="gIngoChestLimb" LimbType="Standard" EnumName="INGO_LIMB_CHEST" Offset="0x13AB8"/>
+        <Limb Name="gIngoLeftShoulderLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_SHOULDER" Offset="0x13AC4"/>
+        <Limb Name="gIngoLeftArmLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_ARM" Offset="0x13AD0"/>
+        <Limb Name="gIngoLeftHandLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_HAND" Offset="0x13ADC"/>
+        <Limb Name="gIngoRightShoulderLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_SHOULDER" Offset="0x13AE8"/>
+        <Limb Name="gIngoRightArmLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_ARM" Offset="0x13AF4"/>
+        <Limb Name="gIngoRightHandLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_HAND" Offset="0x13B00"/>
+        <Limb Name="gIngoHeadLimb" LimbType="Standard" EnumName="INGO_LIMB_HEAD" Offset="0x13B0C"/>
+        <Limb Name="gIngoLeftEyebrowLimb" LimbType="Standard" EnumName="INGO_LIMB_LEFT_EYEBROW" Offset="0x13B18"/>
+        <Limb Name="gIngoRightEyebrowLimb" LimbType="Standard" EnumName="INGO_LIMB_RIGHT_EYEBROW" Offset="0x13B24"/>
+        <Limb Name="gIngoMustacheLimb" LimbType="Standard" EnumName="INGO_LIMB_MUSTACHE" Offset="0x13B30"/>
 
-        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" Offset="0x13B88"/>
+        <Skeleton Name="gIngoSkel" Type="Flex" LimbType="Standard" LimbNone="INGO_LIMB_NONE" LimbMax="INGO_LIMB_MAX" EnumName="IngoLimb" Offset="0x13B88"/>
 
         <Animation Name="object_in_Anim_013C6C" Offset="0x13C6C"/>
         <Animation Name="object_in_Anim_013D60" Offset="0x13D60"/>
diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml
index 87e7a3783..9ee376886 100644
--- a/assets/xml/objects/object_sk2.xml
+++ b/assets/xml/objects/object_sk2.xml
@@ -116,67 +116,67 @@
         <Texture Name="gStalfosTrousersTopTex" Format="rgba16" Width="8" Height="8" Offset="0x77E8"/>
 
         <!-- Stalfos limbs and skeleton -->
-        <Limb Name="gStalfosRootLimb" LimbType="Standard" Offset="0x7868"/>
-        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" Offset="0x7874"/>
-        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" Offset="0x7880"/>
-        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" Offset="0x788C"/>
-        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" Offset="0x7898"/>
-        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" Offset="0x78A4"/>
-        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" Offset="0x78B0"/>
-        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" Offset="0x78BC"/>
-        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" Offset="0x78C8"/>
-        <Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
-        <Limb Name="gStalfosSkullLimb" LimbType="Standard" Offset="0x78E0"/>
-        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" Offset="0x78EC"/>
-        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" Offset="0x78F8"/>
-        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" Offset="0x7904"/>
-        <Limb Name="gStalfosChestLimb" LimbType="Standard" Offset="0x7910"/>
-        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" Offset="0x791C"/>
-        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" Offset="0x7928"/>
-        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" Offset="0x7934"/>
-        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" Offset="0x7940"/>
-        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" Offset="0x794C"/>
-        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" Offset="0x7958"/>
-        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" Offset="0x7964"/>
-        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" Offset="0x7970"/>
-        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" Offset="0x797C"/>
-        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" Offset="0x7988"/>
-        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" Offset="0x7994"/>
-        <Limb Name="gStalfosShieldLimb" LimbType="Standard" Offset="0x79A0"/>
-        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" Offset="0x79AC"/>
-        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" Offset="0x79B8"/>
-        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" Offset="0x79C4"/>
-        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" Offset="0x79D0"/>
-        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" Offset="0x79DC"/>
-        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" Offset="0x79E8"/>
-        <Limb Name="gStalfosSwordLimb" LimbType="Standard" Offset="0x79F4"/>
-        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" Offset="0x7A00"/>
-        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" Offset="0x7A0C"/>
-        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" Offset="0x7A18"/>
-        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" Offset="0x7A24"/>
-        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" Offset="0x7A30"/>
-        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" Offset="0x7A3C"/>
-        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" Offset="0x7A48"/>
-        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" Offset="0x7A54"/>
-        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" Offset="0x7A60"/>
-        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" Offset="0x7A6C"/>
-        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" Offset="0x7A78"/>
-        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" Offset="0x7A84"/>
-        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" Offset="0x7A90"/>
-        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" Offset="0x7A9C"/>
-        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" Offset="0x7AA8"/>
-        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" Offset="0x7AB4"/>
-        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" Offset="0x7AC0"/>
-        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" Offset="0x7ACC"/>
-        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" Offset="0x7AD8"/>
-        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" Offset="0x7AE4"/>
-        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" Offset="0x7AF0"/>
-        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" Offset="0x7AFC"/>
-        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" Offset="0x7B08"/>
-        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" Offset="0x7B14"/>
-        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" Offset="0x7B20"/>
-        <Limb Name="gStalfosWaistLimb" LimbType="Standard" Offset="0x7B2C"/>
-        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
+        <Limb Name="gStalfosRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ROOT" Offset="0x7868"/>
+        <Limb Name="gStalfosUpperBodyRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_UPPERBODY_ROOT" Offset="0x7874"/>
+        <Limb Name="gStalfosLowerCoreRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_CORE_LOWER_ROOT" Offset="0x7880"/>
+        <Limb Name="gStalfosUpperCoreRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_CORE_UPPER_ROOT" Offset="0x788C"/>
+        <Limb Name="gStalfosLowerNeckRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_NECK_ROOT" Offset="0x7898"/>
+        <Limb Name="gStalfosSkullRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_HEAD_ROOT" Offset="0x78A4"/>
+        <Limb Name="gStalfosLimb7Limb" LimbType="Standard" EnumName="STALFOS_LIMB_7" Offset="0x78B0"/>
+        <Limb Name="gStalfosLimb8Limb" LimbType="Standard" EnumName="STALFOS_LIMB_8" Offset="0x78BC"/>
+        <Limb Name="gStalfosJawRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_JAW_ROOT" Offset="0x78C8"/>
+        <Limb Name="gStalfosJawLimb" LimbType="Standard" EnumName="STALFOS_LIMB_JAW" Offset="0x78D4"/>
+        <Limb Name="gStalfosSkullLimb" LimbType="Standard" EnumName="STALFOS_LIMB_HEAD" Offset="0x78E0"/>
+        <Limb Name="gStalfosUpperNeckLimb" LimbType="Standard" EnumName="STALFOS_LIMB_NECK_UPPER" Offset="0x78EC"/>
+        <Limb Name="gStalfosLowerNeckLimb" LimbType="Standard" EnumName="STALFOS_LIMB_NECK_LOWER" Offset="0x78F8"/>
+        <Limb Name="gStalfosUpperCoreLimb" LimbType="Standard" EnumName="STALFOS_LIMB_CORE_UPPER" Offset="0x7904"/>
+        <Limb Name="gStalfosChestLimb" LimbType="Standard" EnumName="STALFOS_LIMB_CHEST" Offset="0x7910"/>
+        <Limb Name="gStalfosRightShoulderRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHOULDER_R_ROOT" Offset="0x791C"/>
+        <Limb Name="gStalfosRightShoulderArmorRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHOULDER_ARMOR_R_ROOT" Offset="0x7928"/>
+        <Limb Name="gStalfosRightShoulderArmorLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHOULDER_ARMOR_R" Offset="0x7934"/>
+        <Limb Name="gStalfosLeftShoulderRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHOULDER_L_ROOT" Offset="0x7940"/>
+        <Limb Name="gStalfosLeftShoulderArmorRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHOULDER_ARMOR_L_ROOT" Offset="0x794C"/>
+        <Limb Name="gStalfosLeftShoulderArmorLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHOULDER_ARMOR_L" Offset="0x7958"/>
+        <Limb Name="gStalfosLeftArmRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ARM_L_ROOT" Offset="0x7964"/>
+        <Limb Name="gStalfosLeftUpperArmRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_UPPERARM_L_ROOT" Offset="0x7970"/>
+        <Limb Name="gStalfosLeftForearmRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOREARM_L_ROOT" Offset="0x797C"/>
+        <Limb Name="gStalfosLeftHandRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_HAND_L_ROOT" Offset="0x7988"/>
+        <Limb Name="gStalfosLeftHandLimb" LimbType="Standard" EnumName="STALFOS_LIMB_HAND_L" Offset="0x7994"/>
+        <Limb Name="gStalfosShieldLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SHIELD" Offset="0x79A0"/>
+        <Limb Name="gStalfosLeftForearmLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOREARM_L" Offset="0x79AC"/>
+        <Limb Name="gStalfosLeftUpperArmLimb" LimbType="Standard" EnumName="STALFOS_LIMB_UPPERARM_L" Offset="0x79B8"/>
+        <Limb Name="gStalfosRightArmRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ARM_R_ROOT" Offset="0x79C4"/>
+        <Limb Name="gStalfosRightUpperArmRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_UPPERARM_R_ROOT" Offset="0x79D0"/>
+        <Limb Name="gStalfosRightForearmRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOREARM_R_ROOT" Offset="0x79DC"/>
+        <Limb Name="gStalfosRightHandRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_HAND_R_ROOT" Offset="0x79E8"/>
+        <Limb Name="gStalfosSwordLimb" LimbType="Standard" EnumName="STALFOS_LIMB_SWORD" Offset="0x79F4"/>
+        <Limb Name="gStalfosRightHandLimb" LimbType="Standard" EnumName="STALFOS_LIMB_HAND_R" Offset="0x7A00"/>
+        <Limb Name="gStalfosRightForearmLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOREARM_R" Offset="0x7A0C"/>
+        <Limb Name="gStalfosRightUpperArmLimb" LimbType="Standard" EnumName="STALFOS_LIMB_UPPERARM_R" Offset="0x7A18"/>
+        <Limb Name="gStalfosLowerCoreLimb" LimbType="Standard" EnumName="STALFOS_LIMB_CORE_LOWER" Offset="0x7A24"/>
+        <Limb Name="gStalfosLowerBodyRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LOWERBODY_ROOT" Offset="0x7A30"/>
+        <Limb Name="gStalfosWaistRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_WAIST_ROOT" Offset="0x7A3C"/>
+        <Limb Name="gStalfosLegsRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LEGS_ROOT" Offset="0x7A48"/>
+        <Limb Name="gStalfosLeftLegRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LEG_L_ROOT" Offset="0x7A54"/>
+        <Limb Name="gStalfosLeftThighRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_THIGH_L_ROOT" Offset="0x7A60"/>
+        <Limb Name="gStalfosLeftLowerLegRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LOWERLEG_L_ROOT" Offset="0x7A6C"/>
+        <Limb Name="gStalfosLeftAnkleRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ANKLE_L_ROOT" Offset="0x7A78"/>
+        <Limb Name="gStalfosLeftAnkleLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ANKLE_L" Offset="0x7A84"/>
+        <Limb Name="gStalfosLeftFootRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOOT_L_ROOT" Offset="0x7A90"/>
+        <Limb Name="gStalfosLeftFootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOOT_L" Offset="0x7A9C"/>
+        <Limb Name="gStalfosLeftLowerLegLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LOWERLEG_L" Offset="0x7AA8"/>
+        <Limb Name="gStalfosLeftThighLimb" LimbType="Standard" EnumName="STALFOS_LIMB_THIGH_L" Offset="0x7AB4"/>
+        <Limb Name="gStalfosRightLegRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LEG_R_ROOT" Offset="0x7AC0"/>
+        <Limb Name="gStalfosRightThighRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_THIGH_R_ROOT" Offset="0x7ACC"/>
+        <Limb Name="gStalfosRightLowerLegRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LOWERLEG_R_ROOT" Offset="0x7AD8"/>
+        <Limb Name="gStalfosRightAnkleRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ANKLE_R_ROOT" Offset="0x7AE4"/>
+        <Limb Name="gStalfosRightAnkleLimb" LimbType="Standard" EnumName="STALFOS_LIMB_ANKLE_R" Offset="0x7AF0"/>
+        <Limb Name="gStalfosRightFootRootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOOT_R_ROOT" Offset="0x7AFC"/>
+        <Limb Name="gStalfosRightFootLimb" LimbType="Standard" EnumName="STALFOS_LIMB_FOOT_R" Offset="0x7B08"/>
+        <Limb Name="gStalfosRightLowerLegLimb" LimbType="Standard" EnumName="STALFOS_LIMB_LOWERLEG_R" Offset="0x7B14"/>
+        <Limb Name="gStalfosRightThighLimb" LimbType="Standard" EnumName="STALFOS_LIMB_THIGH_R" Offset="0x7B20"/>
+        <Limb Name="gStalfosWaistLimb" LimbType="Standard" EnumName="STALFOS_LIMB_WAIST" Offset="0x7B2C"/>
+        <Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" LimbNone="STALFOS_LIMB_NONE" LimbMax="STALFOS_LIMB_MAX" EnumName="StalfosLimb" Offset="0x7C28"/>
 
         <!-- Stalfos Animations -->
         <Animation Name="gStalfosFlinchFromHitBehindAnim" Offset="0x444"/>
diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml
index d73e28972..5ab3863b7 100644
--- a/assets/xml/objects/object_ta.xml
+++ b/assets/xml/objects/object_ta.xml
@@ -1,22 +1,22 @@
 <Root>
     <File Name="object_ta" Segment="6">
-        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" Offset="0xB7B8"/>
-        <Limb Name="gTalonRootLimb" LimbType="Standard" Offset="0xB6B8"/>
-        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" Offset="0xB6C4"/>
-        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" Offset="0xB6D0"/>
-        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" Offset="0xB6DC"/>
-        <Limb Name="gTalonRightThighLimb" LimbType="Standard" Offset="0xB6E8"/>
-        <Limb Name="gTalonRightLegLimb" LimbType="Standard" Offset="0xB6F4"/>
-        <Limb Name="gTalonRightFootLimb" LimbType="Standard" Offset="0xB700"/>
-        <Limb Name="gTalonChestLimb" LimbType="Standard" Offset="0xB70C"/>
-        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" Offset="0xB718"/>
-        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" Offset="0xB724"/>
-        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" Offset="0xB730"/>
-        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" Offset="0xB73C"/>
-        <Limb Name="gTalonRightArmLimb" LimbType="Standard" Offset="0xB748"/>
-        <Limb Name="gTalonRightHandLimb" LimbType="Standard" Offset="0xB754"/>
-        <Limb Name="gTalonHeadLimb" LimbType="Standard" Offset="0xB760"/>
-        <Limb Name="gTalonTorsoLimb" LimbType="Standard" Offset="0xB76C"/>
+        <Skeleton Name="gTalonSkel" Type="Flex" LimbType="Standard" LimbNone="TALON_LIMB_NONE" LimbMax="TALON_LIMB_MAX" EnumName="TalonLimb" Offset="0xB7B8"/>
+        <Limb Name="gTalonRootLimb" LimbType="Standard" EnumName="TALON_LIMB_ROOT" Offset="0xB6B8"/>
+        <Limb Name="gTalonLeftThighLimb" LimbType="Standard" EnumName="TALON_LIMB_LEFT_THIGH" Offset="0xB6C4"/>
+        <Limb Name="gTalonLeftLegLimb" LimbType="Standard" EnumName="TALON_LIMB_LEFT_LEG" Offset="0xB6D0"/>
+        <Limb Name="gTalonLeftFootLimb" LimbType="Standard" EnumName="TALON_LIMB_LEFT_FOOT" Offset="0xB6DC"/>
+        <Limb Name="gTalonRightThighLimb" LimbType="Standard" EnumName="TALON_LIMB_RIGHT_THIGH" Offset="0xB6E8"/>
+        <Limb Name="gTalonRightLegLimb" LimbType="Standard" EnumName="TALON_LIMB_RIGHT_LEG" Offset="0xB6F4"/>
+        <Limb Name="gTalonRightFootLimb" LimbType="Standard" EnumName="TALON_LIMB_RIGHT_FOOT" Offset="0xB700"/>
+        <Limb Name="gTalonChestLimb" LimbType="Standard" EnumName="TALON_LIMB_CHEST" Offset="0xB70C"/>
+        <Limb Name="gTalonLeftShoulderLimb" LimbType="Standard" EnumName="TALON_LIMB_LEFT_SHOULDER" Offset="0xB718"/>
+        <Limb Name="gTalonLeftArmLimb" LimbType="Standard" EnumName="TALON_LIMB_LEFT_ARM" Offset="0xB724"/>
+        <Limb Name="gTalonLeftHandLimb" LimbType="Standard" EnumName="TALON_LIMB_LEFT_HAND" Offset="0xB730"/>
+        <Limb Name="gTalonRightShoulderLimb" LimbType="Standard" EnumName="TALON_LIMB_RIGHT_SHOULDER" Offset="0xB73C"/>
+        <Limb Name="gTalonRightArmLimb" LimbType="Standard" EnumName="TALON_LIMB_RIGHT_ARM" Offset="0xB748"/>
+        <Limb Name="gTalonRightHandLimb" LimbType="Standard" EnumName="TALON_LIMB_RIGHT_HAND" Offset="0xB754"/>
+        <Limb Name="gTalonHeadLimb" LimbType="Standard" EnumName="TALON_LIMB_HEAD" Offset="0xB760"/>
+        <Limb Name="gTalonTorsoLimb" LimbType="Standard" EnumName="TALON_LIMB_TORSO" Offset="0xB76C"/>
         <Animation Name="gTalonSitSleepingAnim" Offset="0x17E8"/>
         <Animation Name="gTalonStandAnim" Offset="0x1C94"/>
         <Animation Name="gTalonSitHandsUpAnim" Offset="0xBF38"/>
diff --git a/assets/xml/objects/object_vali.xml b/assets/xml/objects/object_vali.xml
index 5e511a149..240a7e137 100644
--- a/assets/xml/objects/object_vali.xml
+++ b/assets/xml/objects/object_vali.xml
@@ -71,34 +71,34 @@
         <Texture Name="gBariInnerHoodTex" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
 
         <!-- Bari Limbs and Skeleton -->
-        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" Offset="0x4688"/>
-        <Limb Name="gBariNucleusLimb" LimbType="Standard" Offset="0x4694"/>
-        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46A0"/>
-        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" Offset="0x46AC"/>
-        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" Offset="0x46B8"/>
-        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" Offset="0x46C4"/>
-        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" Offset="0x46D0"/>
-        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" Offset="0x46DC"/>
-        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" Offset="0x46E8"/>
-        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" Offset="0x46F4"/>
-        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" Offset="0x4700"/>
-        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" Offset="0x470C"/>
-        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" Offset="0x4718"/>
-        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" Offset="0x4724"/>
-        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" Offset="0x4730"/>
-        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" Offset="0x473C"/>
-        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" Offset="0x4748"/>
-        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" Offset="0x4754"/>
-        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" Offset="0x4760"/>
-        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" Offset="0x476C"/>
-        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" Offset="0x4778"/>
-        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" Offset="0x4784"/>
-        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" Offset="0x4790"/>
-        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" Offset="0x479C"/>
-        <Limb Name="gBariRightForearmLimb" LimbType="Standard" Offset="0x47A8"/>
-        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" Offset="0x47B4"/>
-        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" Offset="0x47C0"/>
-        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" Offset="0x47CC"/>
-        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" Offset="0x4848"/>
+        <Limb Name="gBariNucleusBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_NUCLEUS_BASE" Offset="0x4688"/>
+        <Limb Name="gBariNucleusLimb" LimbType="Standard" EnumName="VALI_LIMB_NUCLEUS" Offset="0x4694"/>
+        <Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_MANDIBLE_BASE_BASE" Offset="0x46A0"/>
+        <Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_MANDIBLE_BASE" Offset="0x46AC"/>
+        <Limb Name="gBariRightMandibleLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_MANDIBLE" Offset="0x46B8"/>
+        <Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_MANDIBLE_BASE_BASE" Offset="0x46C4"/>
+        <Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_MANDIBLE_BASE" Offset="0x46D0"/>
+        <Limb Name="gBariLeftMandibleLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_MANDIBLE" Offset="0x46DC"/>
+        <Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_ARM_BASE" Offset="0x46E8"/>
+        <Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_UPPER_ARM_BASE" Offset="0x46F4"/>
+        <Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_FOREARM_BASE" Offset="0x4700"/>
+        <Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_BODY_BASE" Offset="0x470C"/>
+        <Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_TIP_BASE" Offset="0x4718"/>
+        <Limb Name="gBariLeftClawTipLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_TIP" Offset="0x4724"/>
+        <Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_BODY" Offset="0x4730"/>
+        <Limb Name="gBariLeftForearmLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_FOREARM" Offset="0x473C"/>
+        <Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_UPPER_ARM" Offset="0x4748"/>
+        <Limb Name="gBariRightArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_ARM_BASE" Offset="0x4754"/>
+        <Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_UPPER_ARM_BASE" Offset="0x4760"/>
+        <Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_FOREARM_BASE" Offset="0x476C"/>
+        <Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_BODY_BASE" Offset="0x4778"/>
+        <Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_TIP_BASE" Offset="0x4784"/>
+        <Limb Name="gBariRightClawTipLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_TIP" Offset="0x4790"/>
+        <Limb Name="gBariRightClawBodyLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_BODY" Offset="0x479C"/>
+        <Limb Name="gBariRightForearmLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_FOREARM" Offset="0x47A8"/>
+        <Limb Name="gBariRightUpperArmLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_UPPER_ARM" Offset="0x47B4"/>
+        <Limb Name="gBariInnerHoodLimb" LimbType="Standard" EnumName="VALI_LIMB_INNER_HOOD" Offset="0x47C0"/>
+        <Limb Name="gBariOuterHoodLimb" LimbType="Standard" EnumName="VALI_LIMB_OUTER_HOOD" Offset="0x47CC"/>
+        <Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" LimbNone="VALI_LIMB_NONE" LimbMax="VALI_LIMB_MAX" EnumName="ValiLimb" Offset="0x4848"/>
     </File>
 </Root>