From e19b1395043baede06bdab4faa2d3df3e93afa79 Mon Sep 17 00:00:00 2001
From: SeDan01 <135468170+SeDan01@users.noreply.github.com>
Date: Fri, 9 Jun 2023 20:31:39 -0400
Subject: [PATCH] Tree Asset Decomp for object_tree (#1278)

* Basic Tree Asset Decomp

* renamed outnames

---------

Co-authored-by: Yoe <you@example.com>
---
 assets/xml/objects/object_tree.xml            | 10 +++++-----
 src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assets/xml/objects/object_tree.xml b/assets/xml/objects/object_tree.xml
index 9d5fb66dd8..89e3984c5a 100644
--- a/assets/xml/objects/object_tree.xml
+++ b/assets/xml/objects/object_tree.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_tree" Segment="6">
-        <DList Name="object_tree_DL_000680" Offset="0x680" />
-        <DList Name="object_tree_DL_0007C8" Offset="0x7C8" />
-        <Texture Name="object_tree_Tex_0008B8" OutName="tex_0008B8" Format="rgba16" Width="32" Height="32" Offset="0x8B8" />
-        <Texture Name="object_tree_Tex_0010B8" OutName="tex_0010B8" Format="rgba16" Width="32" Height="32" Offset="0x10B8" />
-        <Collision Name="object_tree_Colheader_001B2C" Offset="0x1B2C" />
+        <DList Name="gTreeBodyDL" Offset="0x680" />
+        <DList Name="gTreeLeavesDL" Offset="0x7C8" />
+        <Texture Name="gTreeBodyTex" OutName="tree_body" Format="rgba16" Width="32" Height="32" Offset="0x8B8" />
+        <Texture Name="gTreeLeavesTex" OutName="tree_leaves" Format="rgba16" Width="32" Height="32" Offset="0x10B8" />
+        <Collision Name="gTreeTopCol" Offset="0x1B2C" />
     </File>
 </Root>
diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c
index 4c30a763ed..3fff091b6b 100644
--- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c
+++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c
@@ -100,7 +100,7 @@ void ObjTree_Init(Actor* thisx, PlayState* play) {
     } else {
         Actor_SetScale(&this->dyna.actor, 0.1f);
         DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
-        CollisionHeader_GetVirtual(&object_tree_Colheader_001B2C, &colHeader);
+        CollisionHeader_GetVirtual(&gTreeTopCol, &colHeader);
         this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
     }
 
@@ -187,11 +187,11 @@ void ObjTree_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_tree_DL_000680);
+    gSPDisplayList(POLY_OPA_DISP++, gTreeBodyDL);
 
     Matrix_RotateZYX(xRot, 0, zRot, 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_tree_DL_0007C8);
+    gSPDisplayList(POLY_OPA_DISP++, gTreeLeavesDL);
 
     CLOSE_DISPS(play->state.gfxCtx);
 }