mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 17:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Fix order of auto equip message (#2931)

Browse Source 
French text was being displayed in English and vice versa due to incorrectly ordered parameters.
This commit is contained in:
Josh Bodner 2023-06-01 18:40:58 -07:00 committed by GitHub
parent 2957dc61c3
commit 6bf42fd018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
soh/soh/OTRGlobals.cpp
View File

@ -1739,12 +1739,12 @@ extern "C" void* getN64WeirdFrame(s32 i) {
extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSize) { extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSize) {
CustomMessage customMessage("\x04\x1A\x08" CustomMessage customMessage("\x04\x1A\x08"
"D\x96sirez-vous l'\x96quiper maintenant?" "Would you like to equip it now?"
"\x09&&" "\x09&&"
"\x1B%g" "\x1B%g"
"Oui" "Yes"
"&" "&"
"Non" "No"
"%w\x02", "%w\x02",
"\x04\x1A\x08" "\x04\x1A\x08"
"M" "M"
@ -1756,13 +1756,13 @@ extern "C" int GetEquipNowMessage(char* buffer, char* src, const int maxBufferSi
"&" "&"
"Nein!" "Nein!"
"%w\x02", "%w\x02",
"\x04\x1A\x08" "\x04\x1A\x08"
"Would you like to equip it now?" "D\x96sirez-vous l'\x96quiper maintenant?"
"\x09&&" "\x09&&"
"\x1B%g" "\x1B%g"
"Yes" "Oui"
"&" "&"
"No" "Non"
"%w\x02"); "%w\x02");
customMessage.Format(); customMessage.Format();
@ -2098,4 +2098,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla
extern "C" void SaveManager_ThreadPoolWait() { extern "C" void SaveManager_ThreadPoolWait() {
SaveManager::Instance->ThreadPoolWait(); SaveManager::Instance->ThreadPoolWait();
} }