From 34f9fb98863f5972588e6dccc8f8866096e19361 Mon Sep 17 00:00:00 2001
From: krm01 <krm01@users.noreply.github.com>
Date: Thu, 30 Mar 2023 02:57:26 -0700
Subject: [PATCH] [Doc] small, names for mayor dotour's eye and eyebrow
 textures (#1220)

* some naming and tlut assignments to dt eye textures

* update dotour overlays with new texture names

* critical formatting fix
---
 assets/xml/objects/object_dt.xml                 | 16 ++++++++--------
 .../actors/ovl_En_Ending_Hero/z_en_ending_hero.c | 16 ++++++++--------
 .../ovl_En_Ending_Hero6/z_en_ending_hero6.c      | 10 +++++-----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/assets/xml/objects/object_dt.xml b/assets/xml/objects/object_dt.xml
index f1e62d59a8..3acf0c4426 100644
--- a/assets/xml/objects/object_dt.xml
+++ b/assets/xml/objects/object_dt.xml
@@ -28,8 +28,8 @@
         <Texture Name="object_dt_Tex_0071D0" OutName="tex_0071D0" Format="ci8" Width="8" Height="8" Offset="0x71D0" />
         <Texture Name="object_dt_Tex_007210" OutName="tex_007210" Format="rgba16" Width="8" Height="16" Offset="0x7210" />
         <Texture Name="object_dt_Tex_007310" OutName="tex_007310" Format="ci8" Width="8" Height="8" Offset="0x7310" />
-        <Texture Name="object_dt_Tex_007350" OutName="tex_007350" Format="ci8" Width="32" Height="32" Offset="0x7350" />
-        <Texture Name="object_dt_Tex_007750" OutName="tex_007750" Format="ci8" Width="16" Height="16" Offset="0x7750" />
+        <Texture Name="gDotourEyeShockTex" OutName="dotour_eye_shock" Format="ci8" Width="32" Height="32" Offset="0x7350" TlutOffset="0x6C50" /> 
+        <Texture Name="gDotourEyebrowHighTex" OutName="dotour_eyebrow_high" Format="ci8" Width="16" Height="16" Offset="0x7750" TlutOffset="0x6E50" />
         <Texture Name="object_dt_Tex_007850" OutName="tex_007850" Format="ci8" Width="32" Height="32" Offset="0x7850" />
         <Texture Name="object_dt_Tex_007C50" OutName="tex_007C50" Format="ci8" Width="16" Height="16" Offset="0x7C50" />
         <Texture Name="object_dt_Tex_007D50" OutName="tex_007D50" Format="ci8" Width="32" Height="32" Offset="0x7D50" />
@@ -37,15 +37,15 @@
         <Texture Name="object_dt_Tex_008190" OutName="tex_008190" Format="ci8" Width="32" Height="16" Offset="0x8190" />
         <Texture Name="object_dt_Tex_008390" OutName="tex_008390" Format="rgba16" Width="32" Height="64" Offset="0x8390" />
         <Texture Name="object_dt_Tex_009390" OutName="tex_009390" Format="rgba16" Width="16" Height="16" Offset="0x9390" />
-        <Texture Name="object_dt_Tex_009590" OutName="tex_009590" Format="ci8" Width="32" Height="32" Offset="0x9590" />
+        <Texture Name="gDotourEyeOpenTex" OutName="dotour_eye_open" Format="ci8" Width="32" Height="32" Offset="0x9590" TlutOffset="0x6C50" />
         <Texture Name="object_dt_Tex_009990" OutName="tex_009990" Format="rgba16" Width="16" Height="32" Offset="0x9990" />
         <Texture Name="object_dt_Tex_009D90" OutName="tex_009D90" Format="rgba16" Width="16" Height="16" Offset="0x9D90" />
-        <Texture Name="object_dt_Tex_009F90" OutName="tex_009F90" Format="ci8" Width="32" Height="32" Offset="0x9F90" />
-        <Texture Name="object_dt_Tex_00A390" OutName="tex_00A390" Format="ci8" Width="16" Height="16" Offset="0xA390" />
-        <Texture Name="object_dt_Tex_00A490" OutName="tex_00A490" Format="ci8" Width="16" Height="16" Offset="0xA490" />
+        <Texture Name="gDotourEyeClosedTex" OutName="dotour_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x9F90" TlutOffset="0x6C50" />
+        <Texture Name="gDotourEyebrowMidTex" OutName="dotour_eyebrow_mid" Format="ci8" Width="16" Height="16" Offset="0xA390" TlutOffset="0x6E50" />
+        <Texture Name="gDotourEyebrowLowTex" OutName="dotour_eyebrow_low" Format="ci8" Width="16" Height="16" Offset="0xA490" TlutOffset="0x6E50" />
         <Texture Name="object_dt_Tex_00A590" OutName="tex_00A590" Format="rgba16" Width="16" Height="16" Offset="0xA590" />
-        <Texture Name="object_dt_Tex_00A790" OutName="tex_00A790" Format="ci8" Width="32" Height="32" Offset="0xA790" />
-        <Texture Name="object_dt_Tex_00AB90" OutName="tex_00AB90" Format="ci8" Width="32" Height="32" Offset="0xAB90" />
+        <Texture Name="gDotourEyeLookDownTex" OutName="dotour_eye_look_down" Format="ci8" Width="32" Height="32" Offset="0xA790" TlutOffset="0x6C50" />
+        <Texture Name="gDotourEyeSquintTex" OutName="dotour_eye_squint" Format="ci8" Width="32" Height="32" Offset="0xAB90" TlutOffset="0x6C50" />
         <TextureAnimation Name="object_dt_Matanimheader_00AFDC" Offset="0xAFDC" />
         <Limb Name="object_dt_Standardlimb_00AFEC" Type="Standard" EnumName="OBJECT_DT_LIMB_01" Offset="0xAFEC" />
         <Limb Name="object_dt_Standardlimb_00AFF8" Type="Standard" EnumName="OBJECT_DT_LIMB_02" Offset="0xAFF8" />
diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
index 6cdf54d701..1786380ac2 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c
@@ -71,13 +71,13 @@ void EnEndingHero_Update(Actor* thisx, PlayState* play) {
     Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 50.0f, 0x1D);
 }
 
-static TexturePtr D_80C1E970[] = {
-    object_dt_Tex_007350, object_dt_Tex_009590, object_dt_Tex_009F90, object_dt_Tex_00A790, object_dt_Tex_00AB90,
+static TexturePtr sEyeTextures[] = {
+    gDotourEyeShockTex, gDotourEyeOpenTex, gDotourEyeClosedTex, gDotourEyeLookDownTex, gDotourEyeSquintTex,
 };
-static TexturePtr D_80C1E984[] = {
-    object_dt_Tex_007750,
-    object_dt_Tex_00A390,
-    object_dt_Tex_00A490,
+static TexturePtr sEyebrowTextures[] = {
+    gDotourEyebrowHighTex,
+    gDotourEyebrowMidTex,
+    gDotourEyebrowLowTex,
 };
 
 void EnEndingHero_Draw(Actor* thisx, PlayState* play) {
@@ -88,13 +88,13 @@ void EnEndingHero_Draw(Actor* thisx, PlayState* play) {
     func_8012C28C(play->state.gfxCtx);
     func_8012C2DC(play->state.gfxCtx);
 
-    gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_80C1E970[this->unk242]));
+    gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sEyeTextures[this->unk242]));
 
     if (this->unk242 < 3) {
         index = this->unk242;
     }
 
-    gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(D_80C1E984[index]));
+    gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(sEyebrowTextures[index]));
     SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL,
                           NULL, &this->actor);
 
diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
index 8f19fe9f8c..06f973265c 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
+++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c
@@ -121,9 +121,9 @@ void EnEndingHero6_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec
 }
 
 void EnEndingHero6_Draw(Actor* thisx, PlayState* play) {
-    static TexturePtr D_80C24280[] = { object_dt_Tex_007350, object_dt_Tex_009590, object_dt_Tex_009F90,
-                                       object_dt_Tex_00A790, object_dt_Tex_00AB90 };
-    static TexturePtr D_80C24294[] = { object_dt_Tex_007750, object_dt_Tex_00A390, object_dt_Tex_00A490 };
+    static TexturePtr sEyeTextures[] = { gDotourEyeShockTex, gDotourEyeOpenTex, gDotourEyeClosedTex,
+                                         gDotourEyeLookDownTex, gDotourEyeSquintTex };
+    static TexturePtr sEyebrowTextures[] = { gDotourEyebrowHighTex, gDotourEyebrowMidTex, gDotourEyebrowLowTex };
     s32 pad;
     EnEndingHero6* this = THIS;
     s32 index = 0;
@@ -156,13 +156,13 @@ void EnEndingHero6_Draw(Actor* thisx, PlayState* play) {
             }
 
             if (this->npcIndex == 0) {
-                gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_80C24280[this->eyeState]));
+                gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sEyeTextures[this->eyeState]));
 
                 if (this->eyeState < 3) {
                     index = this->eyeState;
                 }
 
-                gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(D_80C24294[index]));
+                gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(sEyebrowTextures[index]));
             }
 
             SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable,