From 808f60a1fa31a05f2a64040a4d662c932152b497 Mon Sep 17 00:00:00 2001
From: Nuss <67802335+hack-nuss@users.noreply.github.com>
Date: Mon, 9 Oct 2023 02:39:15 +0200
Subject: [PATCH] naming (#1425)

---
 assets/xml/objects/object_kzsaku.xml              | 7 ++++---
 src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/assets/xml/objects/object_kzsaku.xml b/assets/xml/objects/object_kzsaku.xml
index af957d7004..fa157409e6 100644
--- a/assets/xml/objects/object_kzsaku.xml
+++ b/assets/xml/objects/object_kzsaku.xml
@@ -1,7 +1,8 @@
 <Root>
+    <!-- Object for Underwater grate -->
     <File Name="object_kzsaku" Segment="6">
-        <DList Name="object_kzsaku_DL_000040" Offset="0x40" /> <!-- Original name is "kz_saku_model" -->
-        <Texture Name="object_kzsaku_Tex_0000D0" OutName="tex_0000D0" Format="ia8" Width="32" Height="128" Offset="0xD0" />
-        <Collision Name="object_kzsaku_Colheader_001118" Offset="0x1118" /> <!-- Original name is "z2_30_saku_bgdatainfo" -->
+        <DList Name="gUnderwaterGrateDL" Offset="0x40" /> <!-- Original name is "kz_saku_model" -->
+        <Texture Name="gUnderwaterGrateTex" OutName="underwater_grate" Format="ia8" Width="32" Height="128" Offset="0xD0" />
+        <Collision Name="gUnderwaterGrateCol" Offset="0x1118" /> <!-- Original name is "z2_30_saku_bgdatainfo" -->
     </File>
 </Root>
diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c
index 00f5e9957a..94937b164e 100644
--- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c
+++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c
@@ -42,7 +42,7 @@ void ObjKzsaku_Init(Actor* thisx, PlayState* play) {
 
     Actor_SetScale(&this->dyna.actor, 1.0f);
     DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
-    CollisionHeader_GetVirtual(&object_kzsaku_Colheader_001118, &col);
+    CollisionHeader_GetVirtual(&gUnderwaterGrateCol, &col);
 
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, col);
 
@@ -124,7 +124,7 @@ void ObjKzsaku_Draw(Actor* thisx, PlayState* play) {
 
     Gfx_SetupDL25_Opa(play->state.gfxCtx);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_OPA_DISP++, object_kzsaku_DL_000040);
+    gSPDisplayList(POLY_OPA_DISP++, gUnderwaterGrateDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }