From 2054637cabe89091df35d86538ee8bff37a263c5 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Sat, 14 Jun 2025 23:06:12 +0200
Subject: [PATCH] Name most `object_gi_*` textures (#2629)

* Name most `object_gi_*` textures

* gGiButterflyTex
---
 assets/xml/objects/object_gi_boots_2.xml      |  2 +-
 assets/xml/objects/object_gi_butterfly.xml    |  2 +-
 assets/xml/objects/object_gi_clothes.xml      |  2 +-
 assets/xml/objects/object_gi_dekupouch.xml    |  2 +-
 assets/xml/objects/object_gi_fire.xml         |  4 ++--
 assets/xml/objects/object_gi_frog.xml         |  2 +-
 assets/xml/objects/object_gi_gerudo.xml       |  2 +-
 assets/xml/objects/object_gi_gerudomask.xml   | 10 +++++-----
 assets/xml/objects/object_gi_ghost.xml        |  4 ++--
 assets/xml/objects/object_gi_gloves.xml       |  2 +-
 assets/xml/objects/object_gi_golonmask.xml    | 10 +++++-----
 assets/xml/objects/object_gi_hoverboots.xml   |  2 +-
 assets/xml/objects/object_gi_ki_tan_mask.xml  |  2 +-
 assets/xml/objects/object_gi_letter.xml       |  4 ++--
 assets/xml/objects/object_gi_liquid.xml       |  6 +++---
 assets/xml/objects/object_gi_milk.xml         |  2 +-
 assets/xml/objects/object_gi_niwatori.xml     |  4 ++--
 assets/xml/objects/object_gi_ocarina.xml      |  2 +-
 assets/xml/objects/object_gi_ocarina_0.xml    |  2 +-
 assets/xml/objects/object_gi_prescription.xml |  2 +-
 assets/xml/objects/object_gi_rabit_mask.xml   |  2 +-
 assets/xml/objects/object_gi_shield_3.xml     |  4 ++--
 assets/xml/objects/object_gi_soldout.xml      |  2 +-
 assets/xml/objects/object_gi_soul.xml         |  2 +-
 assets/xml/objects/object_gi_ticketstone.xml  |  4 ++--
 assets/xml/objects/object_gi_truth_mask.xml   |  4 ++--
 assets/xml/objects/object_gi_zoramask.xml     |  6 +++---
 27 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/assets/xml/objects/object_gi_boots_2.xml b/assets/xml/objects/object_gi_boots_2.xml
index ae5d148421..539422c518 100644
--- a/assets/xml/objects/object_gi_boots_2.xml
+++ b/assets/xml/objects/object_gi_boots_2.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_boots_2" Segment="6">
-        <Texture Name="object_gi_boots_2_000000_Tex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGiIronBootsRivetsTex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiIronBootsVtx" Count="287" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_butterfly.xml b/assets/xml/objects/object_gi_butterfly.xml
index 65eed5b0e8..55ad075ff6 100644
--- a/assets/xml/objects/object_gi_butterfly.xml
+++ b/assets/xml/objects/object_gi_butterfly.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_butterfly" Segment="6">
-        <Texture Name="object_gi_butterfly_000000_Tex" Format="ia4" Width="24" Height="48" Offset="0x0"/>
+        <Texture Name="gGiButterflyTex" Format="ia4" Width="24" Height="48" Offset="0x0"/>
         <Array Name="gGiButterflyContainerVtx" Count="65" Offset="0x240">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_clothes.xml b/assets/xml/objects/object_gi_clothes.xml
index be9853eb8f..5108c274b9 100644
--- a/assets/xml/objects/object_gi_clothes.xml
+++ b/assets/xml/objects/object_gi_clothes.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_gi_clothes" Segment="6">
-        <Texture Name="object_gi_clothes_000000_Tex" Format="i4" Width="64" Height="64" Offset="0x0"/>
+        <Texture Name="gGiTunicCollarTex" Format="i4" Width="64" Height="64" Offset="0x0"/>
         <Array Name="gGiTunicCollarVtx" Count="16" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_dekupouch.xml b/assets/xml/objects/object_gi_dekupouch.xml
index d717edb8ba..4c2b6f6a11 100644
--- a/assets/xml/objects/object_gi_dekupouch.xml
+++ b/assets/xml/objects/object_gi_dekupouch.xml
@@ -2,7 +2,7 @@
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_dekupouch" Segment="6">
         <Texture Name="object_gi_dekupouch_000000_Tex" Format="i4" Width="32" Height="16" Offset="0x0"/>
-        <Texture Name="object_gi_dekupouch_000100_Tex" Format="i4" Width="32" Height="32" Offset="0x100"/>
+        <Texture Name="gGiBulletBagWritingTex" Format="i4" Width="32" Height="32" Offset="0x100"/>
         <Array Name="gGiBulletBagVtx" Count="111" Offset="0x300">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_fire.xml b/assets/xml/objects/object_gi_fire.xml
index 0211f60187..c754877a8e 100644
--- a/assets/xml/objects/object_gi_fire.xml
+++ b/assets/xml/objects/object_gi_fire.xml
@@ -1,8 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_fire" Segment="6">
-        <Texture Name="object_gi_fire_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
-        <Texture Name="object_gi_fire_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
+        <Texture Name="gGiBlueFireFlameTex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gGiBlueFireFireEffectTex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gGiBlueFireChamberstickVtx" Count="130" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_frog.xml b/assets/xml/objects/object_gi_frog.xml
index 53384429b4..8591106120 100644
--- a/assets/xml/objects/object_gi_frog.xml
+++ b/assets/xml/objects/object_gi_frog.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_frog" Segment="6">
-        <Texture Name="object_gi_frog_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGiFrogEyeTex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiFrogVtx" Count="139" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gerudo.xml b/assets/xml/objects/object_gi_gerudo.xml
index 34986a295e..a767dab10e 100644
--- a/assets/xml/objects/object_gi_gerudo.xml
+++ b/assets/xml/objects/object_gi_gerudo.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_gerudo" Segment="6">
-        <Texture Name="object_gi_gerudo_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGiGerudoCardTex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiGerudoCardVtx" Count="182" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gerudomask.xml b/assets/xml/objects/object_gi_gerudomask.xml
index 94576b0406..4a98e810f9 100644
--- a/assets/xml/objects/object_gi_gerudomask.xml
+++ b/assets/xml/objects/object_gi_gerudomask.xml
@@ -1,11 +1,11 @@
 <Root>
     <File Name="object_gi_gerudomask" Segment="6">
-        <Texture Name="object_gi_gerudomask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gGiGerudoMaskTLUT" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
         <Blob Name="object_gi_gerudomask_000200_Blob" Size="0x8" Offset="0x200"/>
-        <Texture Name="object_gi_gerudomask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
-        <Texture Name="object_gi_gerudomask_000248_Tex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
-        <Texture Name="object_gi_gerudomask_000348_Tex" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0"/>
-        <Texture Name="object_gi_gerudomask_000448_Tex" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0"/>
+        <Texture Name="gGiGerudoMaskSkinTex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gGiGerudoMaskHairTex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="gGiGerudoMaskLipsTex" Format="ci8" Width="16" Height="16" Offset="0x348" TlutOffset="0x0"/>
+        <Texture Name="gGiGerudoMaskEyeTex" Format="ci8" Width="32" Height="32" Offset="0x448" TlutOffset="0x0"/>
         <Array Name="gGiGerudoMaskVtx" Count="138" Offset="0x848">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ghost.xml b/assets/xml/objects/object_gi_ghost.xml
index 5dbf39480f..1c98056d85 100644
--- a/assets/xml/objects/object_gi_ghost.xml
+++ b/assets/xml/objects/object_gi_ghost.xml
@@ -1,8 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ghost" Segment="6">
-        <Texture Name="object_gi_ghost_000000_Tex" Format="i8" Width="16" Height="32" Offset="0x0"/>
-        <Texture Name="object_gi_ghost_000200_Tex" Format="i8" Width="16" Height="32" Offset="0x200"/>
+        <Texture Name="gGiGhostFlameTex" Format="i8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gGiGhostFireEffectTex" Format="i8" Width="16" Height="32" Offset="0x200"/>
         <Array Name="gGiGhostContainerLidVtx" Count="56" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_gloves.xml b/assets/xml/objects/object_gi_gloves.xml
index 85ad6ddeff..59d07b16d7 100644
--- a/assets/xml/objects/object_gi_gloves.xml
+++ b/assets/xml/objects/object_gi_gloves.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_gloves" Segment="6">
-        <Texture Name="object_gi_gloves_000000_Tex" Format="i8" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGiGauntletsPlateTex" Format="i8" Width="64" Height="32" Offset="0x0"/>
         <Array Name="gGiGauntletsVtx" Count="152" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_golonmask.xml b/assets/xml/objects/object_gi_golonmask.xml
index 68dbddb365..45c2ba24cd 100644
--- a/assets/xml/objects/object_gi_golonmask.xml
+++ b/assets/xml/objects/object_gi_golonmask.xml
@@ -1,11 +1,11 @@
 <Root>
     <File Name="object_gi_golonmask" Segment="6">
-        <Texture Name="object_gi_golonmask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gGiGoronMaskTLUT" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
         <Blob Name="object_gi_golonmask_000200_Blob" Size="0x8" Offset="0x200"/>
-        <Texture Name="object_gi_golonmask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
-        <Texture Name="object_gi_golonmask_000248_Tex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
-        <Texture Name="object_gi_golonmask_000348_Tex" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0"/>
-        <Texture Name="object_gi_golonmask_000748_Tex" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0"/>
+        <Texture Name="gGiGoronMaskSkinTex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
+        <Texture Name="gGiGoronMaskHairTex" Format="ci8" Width="16" Height="16" Offset="0x248" TlutOffset="0x0"/>
+        <Texture Name="gGiGoronMaskEyeTex" Format="ci8" Width="32" Height="32" Offset="0x348" TlutOffset="0x0"/>
+        <Texture Name="gGiGoronMaskMouthTex" Format="ci8" Width="64" Height="32" Offset="0x748" TlutOffset="0x0"/>
         <Array Name="gGiGoronMaskVtx" Count="91" Offset="0xF48">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_hoverboots.xml b/assets/xml/objects/object_gi_hoverboots.xml
index fed584e742..96a4769ffc 100644
--- a/assets/xml/objects/object_gi_hoverboots.xml
+++ b/assets/xml/objects/object_gi_hoverboots.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_hoverboots" Segment="6">
-        <Texture Name="object_gi_hoverboots_000000_Tex" Format="ia4" Width="48" Height="32" Offset="0x0"/>
+        <Texture Name="gGiHoverBootsWingTex" Format="ia4" Width="48" Height="32" Offset="0x0"/>
         <Texture Name="object_gi_hoverboots_000300_Tex" Format="i4" Width="16" Height="32" Offset="0x300"/>
         <Array Name="gGiHoverBootsVtx" Count="325" Offset="0x400">
             <Vtx/>
diff --git a/assets/xml/objects/object_gi_ki_tan_mask.xml b/assets/xml/objects/object_gi_ki_tan_mask.xml
index b888acfe73..90a2cfca4d 100644
--- a/assets/xml/objects/object_gi_ki_tan_mask.xml
+++ b/assets/xml/objects/object_gi_ki_tan_mask.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ki_tan_mask" Segment="6">
-        <Texture Name="object_gi_ki_tan_mask_000000_Tex" Format="ia8" Width="8" Height="32" Offset="0x0"/>
+        <Texture Name="gGiKeatonMaskEyeTex" Format="ia8" Width="8" Height="32" Offset="0x0"/>
         <Array Name="gGiKeatonMaskVtx" Count="148" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_letter.xml b/assets/xml/objects/object_gi_letter.xml
index 098b8cca79..0034b0466c 100644
--- a/assets/xml/objects/object_gi_letter.xml
+++ b/assets/xml/objects/object_gi_letter.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_gi_letter" Segment="6">
-        <Texture Name="object_gi_letter_000000_Tex" Format="i8" Width="48" Height="32" Offset="0x0"/>
-        <Texture Name="object_gi_letter_000600_Tex" Format="ia8" Width="48" Height="32" Offset="0x600"/>
+        <Texture Name="gGiLetterPaperTex" Format="i8" Width="48" Height="32" Offset="0x0"/>
+        <Texture Name="gGiLetterWritingTex" Format="ia8" Width="48" Height="32" Offset="0x600"/>
         <Array Name="gGiLetterVtx" Count="8" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_liquid.xml b/assets/xml/objects/object_gi_liquid.xml
index 133d8ce902..c40e8110db 100644
--- a/assets/xml/objects/object_gi_liquid.xml
+++ b/assets/xml/objects/object_gi_liquid.xml
@@ -1,9 +1,9 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_liquid" Segment="6">
-        <Texture Name="object_gi_liquid_000000_Tex" Format="ia8" Width="16" Height="32" Offset="0x0"/>
-        <Texture Name="object_gi_liquid_000200_Tex" Format="ia8" Width="16" Height="32" Offset="0x200"/>
-        <Texture Name="object_gi_liquid_000400_Tex" Format="ia8" Width="16" Height="32" Offset="0x400"/>
+        <Texture Name="gGiGreenPotionPatternTex" Format="ia8" Width="16" Height="32" Offset="0x0"/>
+        <Texture Name="gGiRedPotionPatternTex" Format="ia8" Width="16" Height="32" Offset="0x200"/>
+        <Texture Name="gGiBluePotionPatternTex" Format="ia8" Width="16" Height="32" Offset="0x400"/>
         <Array Name="gGiPotionPotVtx" Count="176" Offset="0x600">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_milk.xml b/assets/xml/objects/object_gi_milk.xml
index cc72cec9d1..5fedddbe15 100644
--- a/assets/xml/objects/object_gi_milk.xml
+++ b/assets/xml/objects/object_gi_milk.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_milk" Segment="6">
-        <Texture Name="object_gi_milk_000000_Tex" Format="i8" Width="72" Height="24" Offset="0x0"/>
+        <Texture Name="gGiMilkBottleLabelTex" Format="i8" Width="72" Height="24" Offset="0x0"/>
         <Array Name="gGiMilkBottleContentsVtx" Count="63" Offset="0x6C0">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_niwatori.xml b/assets/xml/objects/object_gi_niwatori.xml
index edf67f88d8..837ba16628 100644
--- a/assets/xml/objects/object_gi_niwatori.xml
+++ b/assets/xml/objects/object_gi_niwatori.xml
@@ -1,8 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_niwatori" Segment="6">
-        <Texture Name="object_gi_niwatori_000000_Tex" Format="i8" Width="32" Height="64" Offset="0x0"/>
-        <Texture Name="object_gi_niwatori_000800_Tex" Format="ia8" Width="32" Height="32" Offset="0x800"/>
+        <Texture Name="gGiChickenFeathersTex" Format="i8" Width="32" Height="64" Offset="0x0"/>
+        <Texture Name="gGiChickenEyeTex" Format="ia8" Width="32" Height="32" Offset="0x800"/>
         <Array Name="gGiChickenVtx" Count="153" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ocarina.xml b/assets/xml/objects/object_gi_ocarina.xml
index dafcb92424..057b6bf5e1 100644
--- a/assets/xml/objects/object_gi_ocarina.xml
+++ b/assets/xml/objects/object_gi_ocarina.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ocarina" Segment="6">
-        <Texture Name="object_gi_ocarina_000000_Tex" Format="i8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGiOcarinaTimeHoleTex" Format="i8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiOcarinaTimeVtx" Count="100" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ocarina_0.xml b/assets/xml/objects/object_gi_ocarina_0.xml
index e43bb3a87c..a8104984be 100644
--- a/assets/xml/objects/object_gi_ocarina_0.xml
+++ b/assets/xml/objects/object_gi_ocarina_0.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ocarina_0" Segment="6">
-        <Texture Name="object_gi_ocarina_0_000000_Tex" Format="i8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGiOcarinaFairyHoleTex" Format="i8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiOcarinaFairyVtx" Count="105" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_prescription.xml b/assets/xml/objects/object_gi_prescription.xml
index 1b4e54ec5d..b83d3dfce2 100644
--- a/assets/xml/objects/object_gi_prescription.xml
+++ b/assets/xml/objects/object_gi_prescription.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_prescription" Segment="6">
-        <Texture Name="object_gi_prescription_000000_Tex" Format="ia8" Width="32" Height="48" Offset="0x0"/>
+        <Texture Name="gGiPrescriptionWritingTex" Format="ia8" Width="32" Height="48" Offset="0x0"/>
         <Array Name="gGiPrescriptionVtx" Count="30" Offset="0x600">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_rabit_mask.xml b/assets/xml/objects/object_gi_rabit_mask.xml
index 65b6cdd4bc..177d640692 100644
--- a/assets/xml/objects/object_gi_rabit_mask.xml
+++ b/assets/xml/objects/object_gi_rabit_mask.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_rabit_mask" Segment="6">
-        <Texture Name="object_gi_rabit_mask_000000_Tex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
+        <Texture Name="gGiBunnyHoodEyeTex" Format="ia8" Width="16" Height="16" Offset="0x0"/>
         <Array Name="gGiBunnyHoodVtx" Count="166" Offset="0x100">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_shield_3.xml b/assets/xml/objects/object_gi_shield_3.xml
index 3550bd0d89..f1860d200a 100644
--- a/assets/xml/objects/object_gi_shield_3.xml
+++ b/assets/xml/objects/object_gi_shield_3.xml
@@ -1,8 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_shield_3" Segment="6">
-        <Texture Name="object_gi_shield_3_000000_Tex" Format="i4" Width="64" Height="32" Offset="0x0"/>
-        <Texture Name="object_gi_shield_3_000400_Tex" Format="i4" Width="64" Height="64" Offset="0x400"/>
+        <Texture Name="gGiMirrorShieldSymbol1Tex" Format="i4" Width="64" Height="32" Offset="0x0"/>
+        <Texture Name="gGiMirrorShieldSymbol2Tex" Format="i4" Width="64" Height="64" Offset="0x400"/>
         <Array Name="gGiMirrorShieldVtx" Count="49" Offset="0xC00">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_soldout.xml b/assets/xml/objects/object_gi_soldout.xml
index ba45784761..be9398e25c 100644
--- a/assets/xml/objects/object_gi_soldout.xml
+++ b/assets/xml/objects/object_gi_soldout.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_gi_soldout" Segment="6">
-        <Texture Name="object_gi_soldout_000000_Tex" Format="ia8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGiSoldOutTex" Format="ia8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiSoldOutVtx" Count="4" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_soul.xml b/assets/xml/objects/object_gi_soul.xml
index 519226270d..f991bf131c 100644
--- a/assets/xml/objects/object_gi_soul.xml
+++ b/assets/xml/objects/object_gi_soul.xml
@@ -1,7 +1,7 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_soul" Segment="6">
-        <Texture Name="object_gi_soul_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGiFairyTex" Format="i8" Width="32" Height="32" Offset="0x0"/>
         <Array Name="gGiFairyContainerBaseCapVtx" Count="69" Offset="0x400">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_ticketstone.xml b/assets/xml/objects/object_gi_ticketstone.xml
index ce756e3abc..238081eaa3 100644
--- a/assets/xml/objects/object_gi_ticketstone.xml
+++ b/assets/xml/objects/object_gi_ticketstone.xml
@@ -1,8 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_ticketstone" Segment="6">
-        <Texture Name="object_gi_ticketstone_000000_Tex" Format="i4" Width="48" Height="24" Offset="0x0"/>
-        <Texture Name="object_gi_ticketstone_000240_Tex" Format="i8" Width="32" Height="24" Offset="0x240"/>
+        <Texture Name="gGiClaimCheckWriting1Tex" Format="i4" Width="48" Height="24" Offset="0x0"/>
+        <Texture Name="gGiClaimCheckWriting2Tex" Format="i8" Width="32" Height="24" Offset="0x240"/>
         <Array Name="gGiClaimCheckVtx" Count="138" Offset="0x540">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_truth_mask.xml b/assets/xml/objects/object_gi_truth_mask.xml
index 32c550560c..2a8608d79b 100644
--- a/assets/xml/objects/object_gi_truth_mask.xml
+++ b/assets/xml/objects/object_gi_truth_mask.xml
@@ -1,8 +1,8 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_gi_truth_mask" Segment="6">
-        <Texture Name="object_gi_truth_mask_000000_Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
-        <Texture Name="object_gi_truth_mask_000400_Tex" Format="i8" Width="32" Height="32" Offset="0x400"/>
+        <Texture Name="gGiMaskOfTruthAccent1Tex" Format="i8" Width="32" Height="32" Offset="0x0"/>
+        <Texture Name="gGiMaskOfTruthAccent2Tex" Format="i8" Width="32" Height="32" Offset="0x400"/>
         <Array Name="gGiMaskOfTruthVtx" Count="158" Offset="0x800">
             <Vtx/>
         </Array>
diff --git a/assets/xml/objects/object_gi_zoramask.xml b/assets/xml/objects/object_gi_zoramask.xml
index 0788f67f0d..71b29f454b 100644
--- a/assets/xml/objects/object_gi_zoramask.xml
+++ b/assets/xml/objects/object_gi_zoramask.xml
@@ -1,11 +1,11 @@
 <Root>
     <File Name="object_gi_zoramask" Segment="6">
-        <Texture Name="object_gi_zoramask_000000_Tex" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
+        <Texture Name="gGiZoraMaskTLUT" Format="rgba16" Width="256" Height="1" Offset="0x0"/>
         <Blob Name="object_gi_zoramask_000200_Blob" Size="0x8" Offset="0x200"/>
         <Texture Name="object_gi_zoramask_000208_Tex" Format="ci8" Width="8" Height="8" Offset="0x208" TlutOffset="0x0"/>
         <Texture Name="object_gi_zoramask_000248_Tex" Format="ci8" Width="32" Height="32" Offset="0x248" TlutOffset="0x0"/>
-        <Texture Name="object_gi_zoramask_000648_Tex" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0"/>
-        <Texture Name="object_gi_zoramask_000A48_Tex" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0"/>
+        <Texture Name="gGiZoraMaskEyeTex" Format="ci8" Width="32" Height="32" Offset="0x648" TlutOffset="0x0"/>
+        <Texture Name="gGiZoraMaskMouthTex" Format="ci8" Width="32" Height="32" Offset="0xA48" TlutOffset="0x0"/>
         <Array Name="gGiZoraMaskVtx" Count="85" Offset="0xE48">
             <Vtx/>
         </Array>