Bombers Part 1: Rename (used) assets (#1847)

* Bombers Part 1: Rename (used) assets

* Fix duplicate definition

* Suggested renames

1 files changed, 31 insertions, 31 deletions

diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml
index 8a422593f..393a3b587 100644
--- a/assets/xml/objects/object_cs.xml
+++ b/assets/xml/objects/object_cs.xml
@@ -2,24 +2,24 @@
     <File Name="object_cs" Segment="6">
         <DList Name="object_cs_DL_000040" Offset="0x40" />
         <Texture Name="object_cs_Tex_0000C0" OutName="tex_0000C0" Format="ia8" Width="64" Height="64" Offset="0xC0" />
-        <Animation Name="object_cs_Anim_001708" Offset="0x1708" /> <!-- Original name is "csn_atsume" ("to collect; to assemble; to gather​") -->
-        <Animation Name="object_cs_Anim_001A1C" Offset="0x1A1C" /> <!-- Original name is "csn_fly" -->
-        <Animation Name="object_cs_Anim_002044" Offset="0x2044" /> <!-- Original name is "csn_fukiya" ("blowgun; blowpipe; dart​") -->
-        <Animation Name="object_cs_Anim_0026B0" Offset="0x26B0" /> <!-- Original name is "csn_keirei" ("salute") -->
-        <Animation Name="object_cs_Anim_002930" Offset="0x2930" /> <!-- Original name is "csn_kinobori" ("tree climbing​") -->
-        <Animation Name="object_cs_Anim_0031C4" Offset="0x31C4" /> <!-- Original name is "csn_kyoro" (onomatopoeic for "looking around restlessly") -->
-        <Animation Name="object_cs_Anim_00349C" Offset="0x349C" /> <!-- Original name is "csn_odoroku" ("surprise") -->
-        <Animation Name="object_cs_Anim_0036B0" Offset="0x36B0" /> <!-- Original name is "csn_run03" -->
-        <Animation Name="object_cs_Anim_003EE4" Offset="0x3EE4" /> <!-- Original name is "csn_senakamise" ("senaka" = "back (of the body)​", "mise" = "to show; to display​") -->
-        <Animation Name="object_cs_Anim_00433C" Offset="0x433C" /> <!-- Original name is "csn_senakatalk" -->
-        <Animation Name="object_cs_Anim_00478C" Offset="0x478C" /> <!-- Original name is "csn_senakawait" -->
-        <Animation Name="object_cs_Anim_004960" Offset="0x4960" /> <!-- Original name is "csn_shagamu" ("to squat; to crouch​") -->
-        <Animation Name="object_cs_Anim_004C1C" Offset="0x4C1C" /> <!-- Original name is "csn_suwari" ("sitting") -->
-        <Animation Name="object_cs_Anim_005128" Offset="0x5128" /> <!-- Original name is "csn_suwaripiyo" ("piyo" = "weakly moving") -->
-        <Animation Name="object_cs_Anim_0053F4" Offset="0x53F4" /> <!-- Original name is "csn_talk01" -->
-        <Animation Name="object_cs_Anim_0057C8" Offset="0x57C8" /> <!-- Original name is "csn_talk02" -->
-        <Animation Name="object_cs_Anim_005DC4" Offset="0x5DC4" /> <!-- Original name is "csn_talk03" -->
-        <Animation Name="object_cs_Anim_0060E8" Offset="0x60E8" /> <!-- Original name is "csn_tome" -->
+        <Animation Name="gBomberJumpAnim" Offset="0x1708" /> <!-- Original name is "csn_atsume" ("to collect; to assemble; to gather​") -->
+        <Animation Name="gBomberHoldCuccoAnim" Offset="0x1A1C" /> <!-- Original name is "csn_fly" -->
+        <Animation Name="gBomberBlowgunAnim" Offset="0x2044" /> <!-- Original name is "csn_fukiya" ("blowgun; blowpipe; dart​") -->
+        <Animation Name="gBomberSaluteAnim" Offset="0x26B0" /> <!-- Original name is "csn_keirei" ("salute") -->
+        <Animation Name="gBomberClimbAnim" Offset="0x2930" /> <!-- Original name is "csn_kinobori" ("tree climbing​") -->
+        <Animation Name="gBomberLookAroundAnim" Offset="0x31C4" /> <!-- Original name is "csn_kyoro" (onomatopoeic for "looking around restlessly") -->
+        <Animation Name="gBomberSurpriseAnim" Offset="0x349C" /> <!-- Original name is "csn_odoroku" ("surprise") -->
+        <Animation Name="gBomberRunAnim" Offset="0x36B0" /> <!-- Original name is "csn_run03" -->
+        <Animation Name="gBomberTurnAroundAnim" Offset="0x3EE4" /> <!-- Original name is "csn_senakamise" ("senaka" = "back (of the body)​", "mise" = "to show; to display​") -->
+        <Animation Name="gBomberTalkShowingNumberAnim" Offset="0x433C" /> <!-- Original name is "csn_senakatalk" -->
+        <Animation Name="gBomberShowNumberAnim" Offset="0x478C" /> <!-- Original name is "csn_senakawait" -->
+        <Animation Name="gBomberHideUnderBoxAnim" Offset="0x4960" /> <!-- Original name is "csn_shagamu" ("to squat; to crouch​") -->
+        <Animation Name="gBomberSitAnim" Offset="0x4C1C" /> <!-- Original name is "csn_suwari" ("sitting") -->
+        <Animation Name="gBomberDazedAnim" Offset="0x5128" /> <!-- Original name is "csn_suwaripiyo" ("piyo" = "weakly moving") -->
+        <Animation Name="gBomberTalkHandsOnHipsAnim" Offset="0x53F4" /> <!-- Original name is "csn_talk01" -->
+        <Animation Name="gBomberTalkNormalAnim" Offset="0x57C8" /> <!-- Original name is "csn_talk02" -->
+        <Animation Name="gBomberArmSwipeAnim" Offset="0x5DC4" /> <!-- Original name is "csn_talk03" -->
+        <Animation Name="gBomberTauntAnim" Offset="0x60E8" /> <!-- Original name is "csn_tome" -->
         <Animation Name="gBomberIdleAnim" Offset="0x64B8" /> <!-- Original name is "csn_wait01" -->
         <DList Name="object_cs_DL_009130" Offset="0x9130" />
         <DList Name="object_cs_DL_009478" Offset="0x9478" />
@@ -57,16 +57,16 @@
         <Texture Name="object_cs_Tex_00C120" OutName="tex_00C120" Format="i8" Width="16" Height="16" Offset="0xC120" />
         <Texture Name="object_cs_Tex_00C220" OutName="tex_00C220" Format="ci8" Width="16" Height="16" Offset="0xC220" />
         <Blob Name="object_cs_Blob_00C320" Size="0x200" Offset="0xC320" />
-        <Texture Name="object_cs_Tex_00C520" OutName="tex_00C520" Format="rgba16" Width="32" Height="32" Offset="0xC520" />
-        <Texture Name="object_cs_Tex_00CD20" OutName="tex_00CD20" Format="rgba16" Width="32" Height="32" Offset="0xCD20" />
-        <Texture Name="object_cs_Tex_00D520" OutName="tex_00D520" Format="rgba16" Width="32" Height="32" Offset="0xD520" />
-        <Texture Name="object_cs_Tex_00DD20" OutName="tex_00DD20" Format="i8" Width="32" Height="32" Offset="0xDD20" />
+        <Texture Name="gBomberEyeOpenTex" OutName="tex_00C520" Format="rgba16" Width="32" Height="32" Offset="0xC520" />
+        <Texture Name="gBomberEyeHalfTex" OutName="tex_00CD20" Format="rgba16" Width="32" Height="32" Offset="0xCD20" />
+        <Texture Name="gBomberEyeClosedTex" OutName="tex_00D520" Format="rgba16" Width="32" Height="32" Offset="0xD520" />
+        <Texture Name="gBomberNumber4Tex" OutName="tex_00DD20" Format="i8" Width="32" Height="32" Offset="0xDD20" />
         <Texture Name="object_cs_Tex_00E120" OutName="tex_00E120" Format="i8" Width="16" Height="16" Offset="0xE120" />
-        <Texture Name="object_cs_Tex_00E220" OutName="tex_00E220" Format="i8" Width="32" Height="32" Offset="0xE220"/>
-        <Texture Name="object_cs_Tex_00E620" OutName="tex_00E620" Format="i8" Width="32" Height="32" Offset="0xE620" />
-        <Texture Name="object_cs_Tex_00EA20" OutName="tex_00EA20" Format="i8" Width="32" Height="32" Offset="0xEA20" />
-        <Texture Name="object_cs_Tex_00EE20" OutName="tex_00EE20" Format="i8" Width="32" Height="32" Offset="0xEE20" />
-        <Texture Name="object_cs_Tex_00F220" OutName="tex_00F220" Format="i8" Width="32" Height="32" Offset="0xF220" />
+        <Texture Name="gBomberWhiteShirtBackTex" OutName="tex_00E220" Format="i8" Width="32" Height="32" Offset="0xE220"/>
+        <Texture Name="gBomberNumber1Tex" OutName="tex_00E620" Format="i8" Width="32" Height="32" Offset="0xE620" />
+        <Texture Name="gBomberNumber2Tex" OutName="tex_00EA20" Format="i8" Width="32" Height="32" Offset="0xEA20" />
+        <Texture Name="gBomberNumber3Tex" OutName="tex_00EE20" Format="i8" Width="32" Height="32" Offset="0xEE20" />
+        <Texture Name="gBomberNumber5Tex" OutName="tex_00F220" Format="i8" Width="32" Height="32" Offset="0xF220" />
         <Texture Name="object_cs_Tex_00F620" OutName="tex_00F620" Format="i8" Width="8" Height="8" Offset="0xF620" />
         <TextureAnimation Name="object_cs_Matanimheader_00F6D4" Offset="0xF6D4" />
         <Limb Name="object_cs_Standardlimb_00F6EC" Type="Standard" EnumName="OBJECT_CS_LIMB_01" Offset="0xF6EC" />
@@ -89,9 +89,9 @@
         <Limb Name="object_cs_Standardlimb_00F7B8" Type="Standard" EnumName="OBJECT_CS_LIMB_12" Offset="0xF7B8" />
         <Limb Name="object_cs_Standardlimb_00F7C4" Type="Standard" EnumName="OBJECT_CS_LIMB_13" Offset="0xF7C4" />
         <Limb Name="object_cs_Standardlimb_00F7D0" Type="Standard" EnumName="OBJECT_CS_LIMB_14" Offset="0xF7D0" />
-        <Skeleton Name="object_cs_Skel_00F82C" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CS_LIMB_NONE" LimbMax="OBJECT_CS_LIMB_MAX" EnumName="ObjectCsLimb" Offset="0xF82C" />
-        <Animation Name="object_cs_Anim_00FAF4" Offset="0xFAF4" /> <!-- Original name is "csn_wait02" -->
-        <Animation Name="object_cs_Anim_01007C" Offset="0x1007C" /> <!-- Original name is "csn_walk" -->
-        <Animation Name="object_cs_Anim_010B68" Offset="0x10B68" /> <!-- Original name is "csn_yarare" ("to suffer damage") -->
+        <Skeleton Name="gBomberSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CS_LIMB_NONE" LimbMax="OBJECT_CS_LIMB_MAX" EnumName="ObjectCsLimb" Offset="0xF82C" />
+        <Animation Name="gBomberHandsOnHipsAnim" Offset="0xFAF4" /> <!-- Original name is "csn_wait02" -->
+        <Animation Name="gBomberWalkAnim" Offset="0x1007C" /> <!-- Original name is "csn_walk" -->
+        <Animation Name="gBomberCaughtAnim" Offset="0x10B68" /> <!-- Original name is "csn_yarare" ("to suffer damage") -->
     </File>
 </Root>