From 825c40049137d32d57aab6ce104167cdbff1e20d Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sun, 15 Oct 2023 11:56:26 -0300
Subject: [PATCH] more asset naming

---
 assets/xml/objects/object_an1.xml       | 14 +++++++++++---
 src/overlays/actors/ovl_En_An/z_en_an.c |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/assets/xml/objects/object_an1.xml b/assets/xml/objects/object_an1.xml
index 3a7c2d640..45a9db4f2 100644
--- a/assets/xml/objects/object_an1.xml
+++ b/assets/xml/objects/object_an1.xml
@@ -1,9 +1,10 @@
 <Root>
+    <!-- Assets for Anju -->
     <File Name="object_an1" Segment="6">
         <Animation Name="gAnju1TastingAnim" Offset="0x1090" /> <!-- Original name is "an_ajimi" ("tasting; sampling​") -->
         <Animation Name="gAnju1TastingEndAnim" Offset="0x144C" /> <!-- Original name is "an_ajimiend" -->
 
-        <Animation Name="object_an1_Anim_001E74" Offset="0x1E74" /> <!-- Original name is "an_aogu" ("to look up") -->
+        <Animation Name="gAnju1LookingUpRelievedAnim" Offset="0x1E74" /> <!-- Original name is "an_aogu" ("to look up") -->
         <Animation Name="gAnju1SurprisedAnim" Offset="0x26B4" /> <!-- Original name is "an_bikkuri" ("to be surprised") -->
         <Animation Name="gAnju1WaitingWithTrayAnim" Offset="0x341C" /> <!-- Original name is "an_obonwait" ("obon" = "tray") -->
         <Animation Name="gAnju1WalkingWithTrayAnim" Offset="0x3EA8" /> <!-- Original name is "an_obonwalk" -->
@@ -13,6 +14,7 @@
         <Animation Name="gAnju1SittingInDisbelieveAnim" Offset="0x7E08" /> <!-- Original name is "an_suzetsubou" ("su" = short for "suwaru", "zetsubou" = "despair; hopelessness​") -->
         <Animation Name="gAnju1IdleAnim" Offset="0x8B6C" /> <!-- Original name is "an_wait" -->
 
+        <!-- Skeleton's Display lists -->
         <DList Name="gAnju1Skirt4DL" Offset="0xBC20" />
         <DList Name="gAnju1Skirt3DL" Offset="0xBD20" />
         <DList Name="gAnju1Skirt2DL" Offset="0xBE60" />
@@ -33,11 +35,13 @@
         <DList Name="gAnju1LeftUpperArmDL" Offset="0xD730" />
         <DList Name="gAnju1TorsoDL" Offset="0xD850" />
 
+        <!-- Skeleton's TLUTs -->
         <Texture Name="gAnju1TLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0xDB20" />
         <Texture Name="gAnju1EyesTLUT" OutName="eyes_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDD20" />
         <Texture Name="gAnju1MouthTLUT" OutName="mouth_tlut" Format="rgba16" Width="16" Height="16" Offset="0xDF20" />
 
-        <Texture Name="object_an1_Tex_00E120" OutName="tex_00E120" Format="ci8" Width="8" Height="8" Offset="0xE120" />
+        <!-- Skeleton's textures -->
+        <Texture Name="gAnju1SkinTex" OutName="anju_skin" Format="ci8" Width="8" Height="8" Offset="0xE120" />
         <Texture Name="gAnju1HairTex" OutName="anju_hair" Format="ci8" Width="8" Height="16" Offset="0xE160" />
         <Texture Name="gAnju1EyeOpenTex" OutName="anju_eye_open" Format="ci8" Width="32" Height="32" Offset="0xE1E0" TlutOffset="0xDD20" />
         <Texture Name="gAnju1EarTex" OutName="anju_ear" Format="ci8" Width="16" Height="16" Offset="0xE5E0" />
@@ -45,7 +49,7 @@
         <Texture Name="gAnju1ShirtButtonTex" OutName="anju_shirt_button" Format="ci8" Width="8" Height="8" Offset="0xE8E0" />
         <Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" />
         <Texture Name="gAnju1SkirtTex" OutName="anju_skirt" Format="ci8" Width="32" Height="32" Offset="0xEA20" />
-        <Texture Name="object_an1_Tex_00EE20" OutName="tex_00EE20" Format="ci8" Width="16" Height="16" Offset="0xEE20" /> <!-- shirt -->
+        <Texture Name="gAnju1ShirtTex" OutName="anju_shirt" Format="ci8" Width="16" Height="16" Offset="0xEE20" />
         <Texture Name="gAnju1SleeveTex" OutName="anju_sleeve" Format="ci8" Width="8" Height="16" Offset="0xEF20" />
         <Texture Name="gAnju1EyeHalfTex" OutName="anju_eye_half" Format="ci8" Width="32" Height="32" Offset="0xEFA0" TlutOffset="0xDD20" />
         <Texture Name="gAnju1EyeClosedTex" OutName="anju_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xF3A0" TlutOffset="0xDD20" />
@@ -58,6 +62,7 @@
         <!-- Empty -->
         <DList Name="object_an1_DL_0111E0" Offset="0x111E0" />
 
+        <!-- Food tray for Granny -->
         <DList Name="gAnju1FoodTrayDL" Offset="0x111E8" /> <!-- Original name is "an_obon_model" -->
         <Texture Name="gAnju1PlateTex" OutName="tray_plate" Format="i8" Width="32" Height="32" Offset="0x11928" />
         <Texture Name="gAnju1Food1Tex" OutName="tray_food_1" Format="rgba16" Width="16" Height="16" Offset="0x11D28" />
@@ -68,8 +73,10 @@
 
         <!-- <Blob Name="object_an1_Blob_0123A8" Size="0x10" Offset="0x123A8" /> -->
 
+        <!-- Chopsticks used for cooking -->
         <DList Name="gAnju1ChopsticksDL" Offset="0x12478" /> <!-- Original name is "an_hashi_model" ("chopsticks​") -->
 
+        <!-- Skeleton's limbs -->
         <Limb Name="gAnju1RootLimb" Type="Standard" EnumName="ANJU1_LIMB_ROOT" Offset="0x124D8" />
         <Limb Name="gAnju1TorsoLimb" Type="Standard" EnumName="ANJU1_LIMB_TORSO" Offset="0x124E4" />
         <Limb Name="gAnju1LeftUpperArmLimb" Type="Standard" EnumName="ANJU1_LIMB_LEFT_UPPERARM" Offset="0x124F0" />
@@ -91,6 +98,7 @@
         <Limb Name="gAnju1Skirt3Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT3" Offset="0x125B0" />
         <Limb Name="gAnju1Skirt4Limb" Type="Standard" EnumName="ANJU1_LIMB_SKIRT4" Offset="0x125BC" />
 
+        <!-- Skeleton -->
         <Skeleton Name="gAnju1Skel" Type="Flex" LimbType="Standard" LimbNone="ANJU1_LIMB_NONE" LimbMax="ANJU1_LIMB_MAX" EnumName="Anju1Limb" Offset="0x12618" />
 
         <Animation Name="gAnju1WalkAnim" Offset="0x13048" /> <!-- Original name is "an_walk" -->
diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c
index c78296e31..dd1bd7e23 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.c
+++ b/src/overlays/actors/ovl_En_An/z_en_an.c
@@ -929,7 +929,7 @@ typedef enum EnAnAnimation {
     /*  3 */ ENAN_ANIM_BOWING,
     /*  4 */ ENAN_ANIM_BOWING_MORPH,
     /*  5 */ ENAN_ANIM_SURPRISED,
-    /*  6 */ ENAN_ANIM_6,
+    /*  6 */ ENAN_ANIM_LOOKING_UP_RELIEVED,
     /*  7 */ ENAN_ANIM_WALK,
     /*  8 */ ENAN_ANIM_WALK2, // Duplicate of ENAN_ANIM_WALK
     /*  9 */ ENAN_ANIM_SIT,
@@ -975,7 +975,7 @@ static AnimationInfoS sAnimationInfo[ENAN_ANIM_MAX] = {
     { &gAnju1BowingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },              // ENAN_ANIM_BOWING
     { &gAnju1BowingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -6 },             // ENAN_ANIM_BOWING_MORPH
     { &gAnju1SurprisedAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },           // ENAN_ANIM_SURPRISED
-    { &object_an1_Anim_001E74, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },        // ENAN_ANIM_6
+    { &gAnju1LookingUpRelievedAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },   // ENAN_ANIM_LOOKING_UP_RELIEVED
     { &gAnju1WalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },                // ENAN_ANIM_WALK
     { &gAnju1WalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },                // ENAN_ANIM_WALK2
     { &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },                 // ENAN_ANIM_SIT
@@ -1904,7 +1904,7 @@ s32 EnAn_ChooseAnimAfterTalking(EnAn* this, PlayState* play) {
 
 void EnAn_DialogueFunc_80B556F8(EnAn* this, PlayState* play) {
     if (this->dialogueFuncState == 0) {
-        EnAn_ChangeAnim(this, play, ENAN_ANIM_6);
+        EnAn_ChangeAnim(this, play, ENAN_ANIM_LOOKING_UP_RELIEVED);
         this->stateFlags &= ~ENAN_STATE_20;
         this->stateFlags |= ENAN_STATE_200;
         this->dialogueFuncState++;