From f7355b91ab547785526cd1654659fcb755ebf6ec Mon Sep 17 00:00:00 2001
From: "Colton G. Rushton" <colton51919@gmail.com>
Date: Wed, 20 May 2020 20:54:25 -0300
Subject: [PATCH 1/2] Add minor sparkle texture fixes

Controlled by TEXTURE_FIX as mandated by the Koopa shorts issues/PRs
---
 src/goddard/renderer.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/goddard/renderer.c b/src/goddard/renderer.c
index 821f9aff..1b94de4c 100644
--- a/src/goddard/renderer.c
+++ b/src/goddard/renderer.c
@@ -569,6 +569,7 @@ static Gfx gd_dl_red_sparkle_4[] = {
     gsSPBranchList(gd_dl_sparkle),
 };
 
+#ifndef TEXTURE_FIX
 static Gfx gd_dl_red_sparkle_4_dup[] ={
     gsDPPipeSync(),
     gsSPDisplayList(gd_dl_sparkle_red_color),
@@ -576,6 +577,15 @@ static Gfx gd_dl_red_sparkle_4_dup[] ={
     gsSPBranchList(gd_dl_sparkle),
 };
 
+#else
+static Gfx gd_dl_red_sparkle_5[] ={
+    gsDPPipeSync(),
+    gsSPDisplayList(gd_dl_sparkle_red_color),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gd_texture_sparkle_5),
+    gsSPBranchList(gd_dl_sparkle),
+};
+#endif
+
 static Gfx gd_dl_silver_sparkle_0[] = {
     gsDPPipeSync(),
     gsSPDisplayList(gd_dl_sparkle_white_color),
@@ -611,6 +621,7 @@ static Gfx gd_dl_silver_sparkle_4[] = {
     gsSPBranchList(gd_dl_sparkle),
 };
 
+#ifndef TEXTURE_FIX
 static Gfx gd_dl_silver_sparkle_4_dup[] = {
     gsDPPipeSync(),
     gsSPDisplayList(gd_dl_sparkle_white_color),
@@ -618,6 +629,15 @@ static Gfx gd_dl_silver_sparkle_4_dup[] = {
     gsSPBranchList(gd_dl_sparkle),
 };
 
+#else
+static Gfx gd_dl_silver_sparkle_5[] = {
+    gsDPPipeSync(),
+    gsSPDisplayList(gd_dl_sparkle_white_color),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gd_texture_sparkle_5),
+    gsSPBranchList(gd_dl_sparkle),
+};
+#endif
+
 static Gfx *gd_red_sparkle_dl_array[] = {
     gd_dl_red_sparkle_4,
     gd_dl_red_sparkle_4,
@@ -629,8 +649,13 @@ static Gfx *gd_red_sparkle_dl_array[] = {
     gd_dl_red_sparkle_1,
     gd_dl_red_sparkle_0,
     gd_dl_red_sparkle_0,
+#ifndef TEXTURE_FIX
     gd_dl_red_sparkle_4_dup,
     gd_dl_red_sparkle_4_dup,
+#else
+    gd_dl_red_sparkle_5,
+    gd_dl_red_sparkle_5,
+#endif
 };
 
 static Gfx *gd_silver_sparkle_dl_array[] = {
@@ -644,8 +669,13 @@ static Gfx *gd_silver_sparkle_dl_array[] = {
     gd_dl_silver_sparkle_1,
     gd_dl_silver_sparkle_0,
     gd_dl_silver_sparkle_0,
+#ifndef TEXTURE_FIX
     gd_dl_silver_sparkle_4_dup,
     gd_dl_silver_sparkle_4_dup,
+#else
+    gd_dl_silver_sparkle_5,
+    gd_dl_silver_sparkle_5,
+#endif
 };
 
 static Gfx gd_texture3_dummy_aligner1[] = {

From ba8345377eeca40a048556ae27f5b38f5ea1359a Mon Sep 17 00:00:00 2001
From: "Colton G. Rushton" <colton51919@gmail.com>
Date: Wed, 20 May 2020 20:59:16 -0300
Subject: [PATCH 2/2] Added info that sparkle texture 5 was fixed

---
 src/goddard/renderer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/goddard/renderer.c b/src/goddard/renderer.c
index 1b94de4c..4fa77986 100644
--- a/src/goddard/renderer.c
+++ b/src/goddard/renderer.c
@@ -493,6 +493,7 @@ ALIGNED8 static u8 gd_texture_sparkle_4[] = {
 
 //! No reference to this texture. Two DL's uses the same previous texture
 //  instead of using this texture.
+// Fixed via setting TEXTURE_FIX to 1.
 ALIGNED8 static u8 gd_texture_sparkle_5[] = {
 #include "textures/intro_raw/sparkle_5.rgba16.inc.c"
 };