From 60c9e869e3102c50de7a3609fe1e65d84da3639a Mon Sep 17 00:00:00 2001
From: Christopher Leggett <chris@leggett.dev>
Date: Sun, 23 Oct 2022 04:04:20 -0400
Subject: [PATCH] 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.
---
 OTRExporter/OTRExporter/Main.cpp              | 11 +++++++++-
 ZAPDTR/ZAPD/ZResource.cpp                     | 22 +++++++++++++++++++
 soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/OTRExporter/OTRExporter/Main.cpp b/OTRExporter/OTRExporter/Main.cpp
index 6a62a9ac4..011e8a94c 100644
--- a/OTRExporter/OTRExporter/Main.cpp
+++ b/OTRExporter/OTRExporter/Main.cpp
@@ -91,8 +91,17 @@ static void ExporterProgramEnd()
 		otrArchive = Ship::Archive::CreateArchive(otrFileName, 40000);
 
 		for (auto item : files) {
+			std::string fName = item.first;
+			if (fName.find("gTitleZeldaShieldLogoMQTex") != std::string::npos && !ZRom(romPath).IsMQ())
+			{
+				size_t pos = 0;
+				if ((pos = fName.find("gTitleZeldaShieldLogoMQTex", 0)) != std::string::npos)
+				{
+					fName.replace(pos, 27, "gTitleZeldaShieldLogoTex");
+				}
+			}
 			auto fileData = item.second;
-			otrArchive->AddFile(item.first, (uintptr_t)fileData.data(),
+			otrArchive->AddFile(fName, (uintptr_t)fileData.data(),
 		                      fileData.size());
 		}
 
diff --git a/ZAPDTR/ZAPD/ZResource.cpp b/ZAPDTR/ZAPD/ZResource.cpp
index d5c76ba27..9afd7048c 100644
--- a/ZAPDTR/ZAPD/ZResource.cpp
+++ b/ZAPDTR/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
diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c
index 198db10a4..129996361 100644
--- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c
+++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c
@@ -913,7 +913,7 @@ void EnMag_DrawInnerVanilla(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp)
     gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha);
 
     if ((s16)this->mainAlpha != 0) {
-        EnMag_DrawImageRGBA32(&gfx, 160, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160);
+        EnMag_DrawImageRGBA32(&gfx, 160, 100, (u8*)gTitleZeldaShieldLogoTex, 160, 160);
     }
 
     func_8009457C(&gfx);