From 6bf42fd018c6d83c540156bf25ba3d4d5bf9af14 Mon Sep 17 00:00:00 2001 From: Josh Bodner <30329717+jbodner09@users.noreply.github.com> Date: Thu, 1 Jun 2023 18:40:58 -0700 Subject: [PATCH] Fix order of auto equip message (#2931) French text was being displayed in English and vice versa due to incorrectly ordered parameters. --- soh/soh/OTRGlobals.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index e57d766dc..ce9fb75bc 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1739,12 +1739,12 @@ extern "C" void* getN64WeirdFrame(s32 i) { extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSize) { CustomMessage customMessage("\x04\x1A\x08" - "D\x96sirez-vous l'\x96quiper maintenant?" + "Would you like to equip it now?" "\x09&&" "\x1B%g" - "Oui" + "Yes" "&" - "Non" + "No" "%w\x02", "\x04\x1A\x08" "M" @@ -1756,13 +1756,13 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi "&" "Nein!" "%w\x02", - "\x04\x1A\x08" - "Would you like to equip it now?" + "\x04\x1A\x08" + "D\x96sirez-vous l'\x96quiper maintenant?" "\x09&&" "\x1B%g" - "Yes" + "Oui" "&" - "No" + "Non" "%w\x02"); customMessage.Format(); @@ -2098,4 +2098,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla extern "C" void SaveManager_ThreadPoolWait() { SaveManager::Instance->ThreadPoolWait(); -} \ No newline at end of file +}