EnBba01 Ok and Documented (#667)

* Decomp Bba_01

* Doc bba01

* Document object_bba

* Remove new line

* Cleanup/rename EnHy to help differentiate it from overlays

* Adjust xml comment

* PR suggestions

* English is hard

* English is hard 2

* Add note about invalid textIds

* typo

* Fix merge

* Remove 0 defines

2 files changed, 79 insertions, 53 deletions

diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml
index b172e9f77..144c685e4 100644
--- a/assets/xml/objects/object_bba.xml
+++ b/assets/xml/objects/object_bba.xml
@@ -1,56 +1,82 @@
 <Root>
+    <!-- Object for Bomb Shop Lady -->
     <File Name="object_bba" Segment="6">
-        <DList Name="object_bba_DL_002A80" Offset="0x2A80" />
-        <DList Name="object_bba_DL_002B70" Offset="0x2B70" />
-        <DList Name="object_bba_DL_002D88" Offset="0x2D88" />
-        <DList Name="object_bba_DL_002E90" Offset="0x2E90" />
-        <DList Name="object_bba_DL_002FA0" Offset="0x2FA0" />
-        <DList Name="object_bba_DL_0031B8" Offset="0x31B8" />
-        <DList Name="object_bba_DL_0032C0" Offset="0x32C0" />
-        <DList Name="object_bba_DL_0033D0" Offset="0x33D0" />
-        <DList Name="object_bba_DL_003618" Offset="0x3618" />
-        <DList Name="object_bba_DL_003760" Offset="0x3760" />
-        <DList Name="object_bba_DL_003968" Offset="0x3968" />
-        <DList Name="object_bba_DL_003F68" Offset="0x3F68" />
-        <DList Name="object_bba_DL_004078" Offset="0x4078" />
-        <DList Name="object_bba_DL_004180" Offset="0x4180" />
-        <Animation Name="object_bba_Anim_004910" Offset="0x4910" />
-        <Animation Name="object_bba_Anim_005154" Offset="0x5154" />
-        <Animation Name="object_bba_Anim_0058B8" Offset="0x58B8" />
-        <Animation Name="object_bba_Anim_005DC4" Offset="0x5DC4" />
-        <Limb Name="object_bba_Standardlimb_005DE0" Type="Standard" Offset="0x5DE0" />
-        <Limb Name="object_bba_Standardlimb_005DEC" Type="Standard" Offset="0x5DEC" />
-        <Limb Name="object_bba_Standardlimb_005DF8" Type="Standard" Offset="0x5DF8" />
-        <Limb Name="object_bba_Standardlimb_005E04" Type="Standard" Offset="0x5E04" />
-        <Limb Name="object_bba_Standardlimb_005E10" Type="Standard" Offset="0x5E10" />
-        <Limb Name="object_bba_Standardlimb_005E1C" Type="Standard" Offset="0x5E1C" />
-        <Limb Name="object_bba_Standardlimb_005E28" Type="Standard" Offset="0x5E28" />
-        <Limb Name="object_bba_Standardlimb_005E34" Type="Standard" Offset="0x5E34" />
-        <Limb Name="object_bba_Standardlimb_005E40" Type="Standard" Offset="0x5E40" />
-        <Limb Name="object_bba_Standardlimb_005E4C" Type="Standard" Offset="0x5E4C" />
-        <Limb Name="object_bba_Standardlimb_005E58" Type="Standard" Offset="0x5E58" />
-        <Limb Name="object_bba_Standardlimb_005E64" Type="Standard" Offset="0x5E64" />
-        <Limb Name="object_bba_Standardlimb_005E70" Type="Standard" Offset="0x5E70" />
-        <Limb Name="object_bba_Standardlimb_005E7C" Type="Standard" Offset="0x5E7C" />
-        <Limb Name="object_bba_Standardlimb_005E88" Type="Standard" Offset="0x5E88" />
-        <Limb Name="object_bba_Standardlimb_005E94" Type="Standard" Offset="0x5E94" />
-        <Limb Name="object_bba_Standardlimb_005EA0" Type="Standard" Offset="0x5EA0" />
-        <Skeleton Name="object_bba_Skel_005EF0" Type="Flex" LimbType="Standard" Offset="0x5EF0" />
-        <Animation Name="object_bba_Anim_006550" Offset="0x6550" />
-        <Animation Name="object_bba_Anim_006B10" Offset="0x6B10" />
-        <Texture Name="object_bba_TLUT_006B20" OutName="tlut_006B20" Format="rgba16" Width="16" Height="16" Offset="0x6B20" />
-        <!-- <Blob Name="object_bba_Blob_006D20" Size="0x19C0" Offset="0x6D20" /> -->
-        <Texture Name="object_bba_Tex_0086E0" OutName="tex_0086E0" Format="ci8" Width="8" Height="8" Offset="0x86E0" />
-        <Texture Name="object_bba_Tex_008720" OutName="tex_008720" Format="ci8" Width="32" Height="32" Offset="0x8720" />
-        <Texture Name="object_bba_Tex_008B20" OutName="tex_008B20" Format="ci8" Width="32" Height="32" Offset="0x8B20" />
-        <Texture Name="object_bba_Tex_008F20" OutName="tex_008F20" Format="ci8" Width="8" Height="8" Offset="0x8F20" />
-        <Texture Name="object_bba_Tex_008F60" OutName="tex_008F60" Format="ci8" Width="8" Height="8" Offset="0x8F60" />
-        <Texture Name="object_bba_Tex_008FA0" OutName="tex_008FA0" Format="ci8" Width="16" Height="16" Offset="0x8FA0" />
-        <Texture Name="object_bba_Tex_0090A0" OutName="tex_0090A0" Format="ci8" Width="16" Height="16" Offset="0x90A0" />
-        <Texture Name="object_bba_Tex_0091A0" OutName="tex_0091A0" Format="ci8" Width="16" Height="16" Offset="0x91A0" />
-        <Texture Name="object_bba_Tex_0092A0" OutName="tex_0092A0" Format="rgba16" Width="32" Height="32" Offset="0x92A0" />
-        <Texture Name="object_bba_Tex_009AA0" OutName="tex_009AA0" Format="ci8" Width="16" Height="16" Offset="0x9AA0" />
-        <Texture Name="object_bba_Tex_009BA0" OutName="tex_009BA0" Format="ci8" Width="32" Height="32" Offset="0x9BA0" />
-        <Texture Name="object_bba_Tex_009FA0" OutName="tex_009FA0" Format="ci8" Width="16" Height="16" Offset="0x9FA0" />
+        <!-- DLists -->
+        <DList Name="gBbaUpperLegsDL" Offset="0x2A80" />
+        <DList Name="gBbaRightHandDL" Offset="0x2B70" />
+        <DList Name="gBbaRightForearmDL" Offset="0x2D88" />
+        <DList Name="gBbaRightUpperArmDL" Offset="0x2E90" />
+        <DList Name="gBbaLeftHandDL" Offset="0x2FA0" />
+        <DList Name="gBbaLeftForearmDL" Offset="0x31B8" />
+        <DList Name="gBbaLeftUpperArmDL" Offset="0x32C0" />
+        <DList Name="gBbaTorsoDL" Offset="0x33D0" />
+        <DList Name="gBbaBagDL" Offset="0x3618" />
+        <DList Name="gBbaNeckDL" Offset="0x3760" />
+        <DList Name="gBbaHeadDL" Offset="0x3968" />
+        <DList Name="gBbaMiddleLegsDL" Offset="0x3F68" />
+        <DList Name="gBbaLowerLegsDL" Offset="0x4078" />
+        <DList Name="gBbaFeetDL" Offset="0x4180" />
+
+        <!-- Animations -->
+        <Animation Name="gBbaWalkingAnim" Offset="0x4910" /> <!-- Looks to be unused -->
+        <Animation Name="gBbaKnockedOverAnim" Offset="0x5154" />
+        <Animation Name="gBbaLyingDownAnim" Offset="0x58B8" />
+        <Animation Name="gBbaIdleHoldingBagAnim" Offset="0x5DC4" />
+
+        <!-- Skeleton -->
+        <Limb Name="gBbaUpperLegsLimb" Type="Standard" EnumName="BBA_LIMB_UPPER_LEGS" Offset="0x5DE0" />
+        <Limb Name="gBbaMiddleLegsLimb" Type="Standard" EnumName="BBA_LIMB_MIDDLE_LEGS" Offset="0x5DEC" />
+        <Limb Name="gBbaLowerLegsLimb" Type="Standard" EnumName="BBA_LIMB_LOWER_LEGS" Offset="0x5DF8" />
+        <Limb Name="gBbaFeetLimb" Type="Standard" EnumName="BBA_LIMB_FEET" Offset="0x5E04" />
+        <Limb Name="gBbaUpperRootLimb" Type="Standard" EnumName="BBA_LIMB_UPPER_ROOT" Offset="0x5E10" />
+        <Limb Name="gBbaNeckLimb" Type="Standard" EnumName="BBA_LIMB_NECK" Offset="0x5E1C" />
+        <Limb Name="gBbaHeadLimb" Type="Standard" EnumName="BBA_LIMB_HEAD" Offset="0x5E28" />
+        <Limb Name="gBbaBagLimb" Type="Standard" EnumName="BBA_LIMB_BAG" Offset="0x5E34" />
+        <Limb Name="gBbaTorsoLimb" Type="Standard" EnumName="BBA_LIMB_TORSO" Offset="0x5E40" />
+        <Limb Name="gBbaLeftUpperArmLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_UPPER_ARM" Offset="0x5E4C" />
+        <Limb Name="gBbaLeftLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_LOWER_ARM_ROOT" Offset="0x5E58" />
+        <Limb Name="gBbaLeftForearmLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_FOREARM" Offset="0x5E64" />
+        <Limb Name="gBbaLeftHandLimb" Type="Standard" EnumName="BBA_LIMB_LEFT_HAND" Offset="0x5E70" />
+        <Limb Name="gBbaRightUpperArmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_UPPER_ARM" Offset="0x5E7C" />
+        <Limb Name="gBbaRightLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x5E88" />
+        <Limb Name="gBbaRightForearmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_FOREARM" Offset="0x5E94" />
+        <Limb Name="gBbaRightHandLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_HAND" Offset="0x5EA0" />
+        <Skeleton Name="gBbaSkel" Type="Flex" LimbType="Standard" LimbNone="BBA_LIMB_NONE" LimbMax="BBA_LIMB_MAX" EnumName="BbaLimbs" Offset="0x5EF0" />
+
+         <!-- Animations -->
+        <Animation Name="gBbaIdleAnim" Offset="0x6550" />
+        <Animation Name="gBbaWalkingHoldingBagAnim" Offset="0x6B10" />
+
+        <!-- TLUT -->
+        <Texture Name="gBbaTLUT" OutName="bba_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6B20" />
+
+        <!-- Unused Textures -->
+        <!-- These are just exact copies of the used textures -->
+        <Texture Name="gBbaUnusedHairSkinTex" OutName="bba_unused_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedEarTex" OutName="bba_unused_ear" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedNostrilTex" OutName="bba_unused_nostril" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedEyeTex" OutName="bba_unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
+        <Texture Name="gBbaUnusedWrinklesTex" OutName="bba_unused_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedCheekTex" OutName="bba_unused_cheek" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedSkinTex" OutName="bba_unused_skin" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedForeheadTex" OutName="bba_unused_forehead" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedFingersTex" OutName="bba_unused_fingers" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedShirtTex" OutName="bba_unused_shirt" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedBagTex" OutName="bba_unused_bag" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
+        <Texture Name="gBbaUnusedSkirtTex" OutName="bba_unused_skirt" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
+
+        <!-- Textures -->
+        <Texture Name="gBbaSkinTex" OutName="bba_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" />
+        <Texture Name="gBbaWrinklesTex" OutName="bba_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x8720" />
+        <Texture Name="gBbaHairSkinTex" OutName="bba_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x8B20" />
+        <Texture Name="gBbaNostrilTex" OutName="bba_nostril" Format="ci8" Width="8" Height="8" Offset="0x8F20" />
+        <Texture Name="gBbaEarTex" OutName="bba_ear" Format="ci8" Width="8" Height="8" Offset="0x8F60" />
+        <Texture Name="gBbaFingersTex" OutName="bba_fingers" Format="ci8" Width="16" Height="16" Offset="0x8FA0" />
+        <Texture Name="gBbaBagTex" OutName="bba_bag" Format="ci8" Width="16" Height="16" Offset="0x90A0" />
+        <Texture Name="gBbaSkirtTex" OutName="bba_skirt" Format="ci8" Width="16" Height="16" Offset="0x91A0" />
+        <Texture Name="gBbaEyeTex" OutName="bba_eye" Format="rgba16" Width="32" Height="32" Offset="0x92A0" />
+        <Texture Name="gBbaCheekTex" OutName="bba_cheek" Format="ci8" Width="16" Height="16" Offset="0x9AA0" />
+        <Texture Name="gBbaForeheadTex" OutName="bba_forehead" Format="ci8" Width="32" Height="32" Offset="0x9BA0" />
+        <Texture Name="gBbaShirtTex" OutName="bba_shirt" Format="ci8" Width="16" Height="16" Offset="0x9FA0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml
index acddaee86..fccbf539f 100644
--- a/assets/xml/objects/object_cne.xml
+++ b/assets/xml/objects/object_cne.xml
@@ -24,7 +24,7 @@
         <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
         <Texture Name="gCneSkinTex" OutName="cne_skin" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
         <Texture Name="gCneBrownHairTex" OutName="cne_brown_hair" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
-        <Texture Name="gCneHandTex" OutName="cne_hand_tex" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
+        <Texture Name="gCneHandTex" OutName="cne_hand" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
         <Texture Name="gCneBrownHairSkinTex" OutName="cne_brown_hair_skin" Format="ci8" Width="8" Height="8" Offset="0x3BC"/>
         <Texture Name="gCneBrownHairFaceTex" OutName="cne_brown_hair_face" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
         <Texture Name="gCneDressTex" OutName="cne_dress" Format="i8" Width="8" Height="8" Offset="0x47C"/>