From 1dc80ffc3aa41e06ffd57b639a413c1319692716 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Sat, 13 Jan 2024 17:47:00 +0000
Subject: [PATCH] Fix the other things that used sunTex (#38)

---
 mm/assets/xml/objects/gameplay_keep.xml |  8 ++++----
 mm/src/code/z_kankyo.c                  | 24 +++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/mm/assets/xml/objects/gameplay_keep.xml b/mm/assets/xml/objects/gameplay_keep.xml
index f44b17890..321933839 100644
--- a/mm/assets/xml/objects/gameplay_keep.xml
+++ b/mm/assets/xml/objects/gameplay_keep.xml
@@ -1408,12 +1408,12 @@
         <!-- #region 2S2H [Port] Treat these properly as 64x64 on extraction-->
         <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="64" Offset="0x79B10" />
         <!-- <Texture Name="gSun1Tex" OutName="sun_1" Format="i4" Width="64" Height="31" Offset="0x79B10" /> -->
-        <!-- <Texture Name="gSun2Tex" OutName="sun_2" Format="i4" Width="64" Height="16" Offset="0x79EF0" /> -->
-        <!-- <Texture Name="gSun3Tex" OutName="sun_3" Format="i4" Width="64" Height="17" Offset="0x7A0F0" /> -->
+        <Texture Name="gSun2Tex" OutName="sun_2" Format="i4" Width="64" Height="16" Offset="0x79EF0" />
+        <Texture Name="gSun3Tex" OutName="sun_3" Format="i4" Width="64" Height="17" Offset="0x7A0F0" />
         <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="64" Offset="0x7A310" />
         <!-- <Texture Name="gSunEvening1Tex" OutName="sun_evening_1" Format="i4" Width="64" Height="31" Offset="0x7A310" /> -->
-        <!-- <Texture Name="gSunEvening2Tex" OutName="sun_evening_2" Format="i4" Width="64" Height="16" Offset="0x7A6F0" /> -->
-        <!-- <Texture Name="gSunEvening3Tex" OutName="sun_evening_3" Format="i4" Width="64" Height="17" Offset="0x7A8F0" /> -->
+        <Texture Name="gSunEvening2Tex" OutName="sun_evening_2" Format="i4" Width="64" Height="16" Offset="0x7A6F0" />
+        <Texture Name="gSunEvening3Tex" OutName="sun_evening_3" Format="i4" Width="64" Height="17" Offset="0x7A8F0" />
 
         <DList Name="gSunSparkleMaterialDL" Offset="0x7AB10" /> <!-- sun (sparkles when small) displaylist -->
         <DList Name="gSunSparkleModelDL" Offset="0x7AB58" />
diff --git a/mm/src/code/z_kankyo.c b/mm/src/code/z_kankyo.c
index 73d583c03..70824ba8d 100644
--- a/mm/src/code/z_kankyo.c
+++ b/mm/src/code/z_kankyo.c
@@ -1763,7 +1763,29 @@ void Environment_DrawSun(PlayState* play) {
             Matrix_Scale(sSunScale, sSunScale, sSunScale, MTXMODE_APPLY);
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_LOAD);
             Gfx_SetupDL54_Opa(play->state.gfxCtx);
-            gSPDisplayList(POLY_OPA_DISP++, gSunDL);
+
+            // #region 2S2H [Port] The sun texture was originally broken up into 3 pieces, but this causes
+            // issues with extraction, so we've combined them into a single 64x64 texture, and this requires
+            // that we render it ourself instead of using gSunDL.
+            // gSPDisplayList(POLY_OPA_DISP++, gSunDL);
+            static Vtx vertices[] = {
+                VTX(-31, -31, 0, 0, 0, 255, 255, 255, 255),
+                VTX(32, -31, 0, 2016, 0, 255, 255, 255, 255),
+                VTX(-31, 32, 0, 0, 2016, 255, 255, 255, 255),
+                VTX(32, 32, 0, 2016, 2016, 255, 255, 255, 255),
+            };
+
+            gSPMatrix(POLY_OPA_DISP++, D_01000000_TO_SEGMENTED, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+            gDPPipeSync(POLY_OPA_DISP++);
+            gDPLoadTextureBlock_4b(POLY_OPA_DISP++, gSun1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
+                                G_TX_NOMIRROR | G_TX_CLAMP,
+                                6, 6, G_TX_NOLOD, G_TX_NOLOD);
+            gDPLoadMultiBlock_4b(POLY_OPA_DISP++, gSunEvening1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0,
+                                G_TX_NOMIRROR | G_TX_CLAMP,
+                                G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
+            gSPVertex(POLY_OPA_DISP++, vertices, 4, 0);
+            gSP2Triangles(POLY_OPA_DISP++, 0, 1, 2, 0, 2, 1, 3, 0);
+            // #endregion
         }
 
         CLOSE_DISPS(play->state.gfxCtx);