From f53aaff7dba71aac8fa3e1722282ff54b5061277 Mon Sep 17 00:00:00 2001
From: Llennpie <44985633+Llennpie@users.noreply.github.com>
Date: Mon, 27 Dec 2021 12:57:35 -0500
Subject: [PATCH] Fix a few texture errors

---
 addons/saturn/assets/graphics/saturn/white.png | Bin 0 -> 138 bytes
 src/moon/saturn/saturn_textures.cpp            |  12 ++++--------
 2 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 addons/saturn/assets/graphics/saturn/white.png

diff --git a/addons/saturn/assets/graphics/saturn/white.png b/addons/saturn/assets/graphics/saturn/white.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3789aa3f462eb93682a77196c6a8c5607dbf0cb
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6<c0X`wF|NsAAenk2Nkjq)%5n0T@z_%ZS87)|YRe*v5o-U3d8t0QGSQj&>
cCnPX1FexxFay<6G2b5#*boFyt=akR{06UT(o&W#<

literal 0
HcmV?d00001

diff --git a/src/moon/saturn/saturn_textures.cpp b/src/moon/saturn/saturn_textures.cpp
index ca7740df..686c5804 100644
--- a/src/moon/saturn/saturn_textures.cpp
+++ b/src/moon/saturn/saturn_textures.cpp
@@ -73,11 +73,7 @@ void saturn_emblem_swap() {
             if (custom_emblem_name != "default") {
                 (*hookTexture) = const_cast<char*>(custom_emblem_name.c_str());
             } else {
-#ifdef __MINGW32__
                 (*hookTexture) = const_cast<char*>("actors/mario/mario_logo.rgba16");
-#else
-                (*hookTexture) = const_cast<char*>(texName.c_str());
-#endif
             }
         }
     }});
@@ -108,7 +104,7 @@ void saturn_stache_swap() {
             if (custom_stache_name != "default") {
                 (*hookTexture) = const_cast<char*>(custom_stache_name.c_str());
             } else {
-                (*hookTexture) = const_cast<char*>(texName.c_str());
+                (*hookTexture) = const_cast<char*>("actors/mario/mario_mustache.rgba16");
             }
         }
     }});
@@ -139,7 +135,7 @@ void saturn_button_swap() {
             if (custom_button_name != "default") {
                 (*hookTexture) = const_cast<char*>(custom_button_name.c_str());
             } else {
-                (*hookTexture) = const_cast<char*>(texName.c_str());
+                (*hookTexture) = const_cast<char*>("actors/mario/mario_overalls_button.rgba16");
             }
         }
     }});
@@ -170,7 +166,7 @@ void saturn_sideburn_swap() {
             if (custom_sideburn_name != "default") {
                 (*hookTexture) = const_cast<char*>(custom_sideburn_name.c_str());
             } else {
-                (*hookTexture) = const_cast<char*>(texName.c_str());
+                (*hookTexture) = const_cast<char*>("actors/mario/mario_sideburn.rgba16");
             }
         }
     }});
@@ -201,7 +197,7 @@ void saturn_chroma_sky_swap() {
             if (has_changed_chroma_sky) {
                 (*hookTexture) = const_cast<char*>("saturn/white");
             } else {
-                (*hookTexture) = const_cast<char*>(texName.c_str());
+                (*hookTexture) = const_cast<char*>("textures/skyboxes/clouds.rgba16");
             }
         }
     }});