From 01d581641786b25fc88762bb679abada38191326 Mon Sep 17 00:00:00 2001
From: Wimmer <71473855+Wimmerrad@users.noreply.github.com>
Date: Fri, 13 Oct 2023 13:50:00 +0200
Subject: [PATCH] obj_big_fwall (#1435)

* Big Fire Wall

Big fire wall.xml / Z en encount3.c update

* RingOfFire update
---
 assets/xml/objects/object_big_fwall.xml             | 5 +++--
 src/overlays/actors/ovl_En_Encount3/z_en_encount3.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assets/xml/objects/object_big_fwall.xml b/assets/xml/objects/object_big_fwall.xml
index bb8b838be1..f1becbe8ef 100644
--- a/assets/xml/objects/object_big_fwall.xml
+++ b/assets/xml/objects/object_big_fwall.xml
@@ -1,6 +1,7 @@
 <Root>
+    <!-- Ring Of Fire used during Garo's encounters -->
     <File Name="object_big_fwall" Segment="6">
-        <Texture Name="object_big_fwall_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0" />
-        <DList Name="object_big_fwall_DL_0009A0" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
+        <Texture Name="gRingOfFireTex" OutName="ring_of_fire" Format="i8" Width="32" Height="64" Offset="0x0" />
+        <DList Name="gRingOfFireDL" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
     </File>
 </Root>
diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c
index 931e8c6d4d..fa37bcb38c 100644
--- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c
+++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c
@@ -199,7 +199,7 @@ void EnEncount3_Draw(Actor* thisx, PlayState* play) {
         Matrix_Scale(this->unk168, this->unk174, this->unk168, MTXMODE_APPLY);
 
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, object_big_fwall_DL_0009A0);
+        gSPDisplayList(POLY_XLU_DISP++, gRingOfFireDL);
 
         Matrix_Pop();
         CLOSE_DISPS(play->state.gfxCtx);