From 43df8f44547354006cff735d9ba2c0b0f0defc83 Mon Sep 17 00:00:00 2001
From: Nuss <67802335+hack-nuss@users.noreply.github.com>
Date: Sat, 7 Oct 2023 06:47:03 +0200
Subject: [PATCH] object_comb (#1420)

* naming

* OutName
---
 assets/xml/objects/object_comb.xml            | 12 ++++++++----
 src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/assets/xml/objects/object_comb.xml b/assets/xml/objects/object_comb.xml
index d2b00b0ddd..2bea4db20b 100644
--- a/assets/xml/objects/object_comb.xml
+++ b/assets/xml/objects/object_comb.xml
@@ -1,8 +1,12 @@
 <Root>
+    <!-- Object for Beehive -->
     <File Name="object_comb" Segment="6">
-        <Texture Name="object_comb_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
-        <DList Name="object_comb_DL_000CB0" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
-        <Texture Name="object_comb_Tex_000E10" OutName="tex_000E10" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
-        <DList Name="object_comb_DL_001040" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
+        <!-- Beehive -->
+        <Texture Name="gBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x0" />
+        <DList Name="gBeehiveDL" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
+
+        <!-- Beehive Fragment -->
+        <Texture Name="gBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
+        <DList Name="gBeehiveFragmentDL" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
     </File>
 </Root>
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index be3d243e05..4227178e25 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -127,7 +127,7 @@ void func_8098CEAC(ObjComb* this, PlayState* play) {
             phi_v0 = 0x20;
         }
         EffectSsKakera_Spawn(play, &spD0, &spC4, &spD0, phi_s0, phi_v0, phi_s1, 4, 0, temp_f10, 0, 0, 60, -1,
-                             OBJECT_COMB, object_comb_DL_001040);
+                             OBJECT_COMB, gBeehiveFragmentDL);
     }
 
     spD0.x = this->actor.world.pos.x;
@@ -185,7 +185,7 @@ void func_8098D19C(ObjComb* this, PlayState* play) {
         }
 
         EffectSsKakera_Spawn(play, &spD0, &spC4, &spD0, phi_s0, phi_v0, phi_s1, 4, 0, temp_f8, 0, 0, 60, -1,
-                             OBJECT_COMB, object_comb_DL_001040);
+                             OBJECT_COMB, gBeehiveFragmentDL);
     }
 
     spD0.x = this->actor.world.pos.x;
@@ -236,7 +236,7 @@ void func_8098D47C(ObjComb* this, PlayState* play) {
         }
 
         EffectSsKakera_Spawn(play, &spC8, &spBC, &spC8, phi_s0, phi_v0, 40, 0, 0, temp_f10, 0, 0, 80, -1, OBJECT_COMB,
-                             object_comb_DL_001040);
+                             gBeehiveFragmentDL);
     }
 }
 
@@ -566,7 +566,7 @@ void ObjComb_Draw(Actor* thisx, PlayState* play) {
     Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
 
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_OPA_DISP++, object_comb_DL_000CB0);
+    gSPDisplayList(POLY_OPA_DISP++, gBeehiveDL);
 
     Collider_UpdateSpheres(0, &this->collider);