From fa5bfdf44a077374e83bf7ade42c4da264e9f658 Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 23 Oct 2022 04:04:20 -0400
Subject: Ensures MQ and Vanilla title Logos are saved with different names.
 (#1788)

This way either one can be loaded according to which OTR/whether or not MQ is enabled.
---
 ZAPD/ZResource.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ZAPD/ZResource.cpp b/ZAPD/ZResource.cpp
index d5c76ba..9afd704 100644
--- a/ZAPD/ZResource.cpp
+++ b/ZAPD/ZResource.cpp
@@ -362,6 +362,28 @@ static const char %s[] __attribute__((aligned (2))) = d%s;
 			}
 		}
 
+		if (name == "gTitleZeldaShieldLogoMQTex")
+		{
+			std::string addName = "gTitleZeldaShieldLogoTex";
+			nameStr = StringHelper::Strip(StringHelper::Strip(addName, "\n"), "\r");
+			str += StringHelper::Sprintf("\n#define d%s \"__OTR__%s/%s/%s\"", addName.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str());
+			if (nameSet && nameSet->find(addName) == nameSet->end())
+			{
+				str += StringHelper::Sprintf(R"(
+#ifdef _WIN32
+static const __declspec(align(2)) char %s[] = d%s;
+#else
+static const char %s[] __attribute__((aligned (2))) = d%s;
+#endif
+			)", addName.c_str(), addName.c_str(), addName.c_str(), addName.c_str());
+
+				if (nameSet)
+				{
+					nameSet->insert(addName);
+				}
+			}
+		}
+
 		return str;
 	}
 	else
-- 
cgit v1.2.3