From bb6a80b4804fa1a45b6b44d935e9a6adc8321a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Tue, 7 Jul 2026 13:24:18 +0000
Subject: [PATCH] fix regression where gerudo guards stopped asking if you want
 to be jailed (#6879)

---
 .../randomizer/Messages/Miscellaneous.cpp        | 16 ++++++++++++++++
 soh/soh/Enhancements/randomizer/Traps.cpp        |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp b/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp
index 832cf45652..5a3c846541 100644
--- a/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp
@@ -53,6 +53,21 @@ void BuildFixedMallonAtCastleMessage(uint16_t* textId, bool* loadFromMessageTabl
     }
 }
 
+void BuildGerudoGuardJailOfferMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    Player* player = GET_PLAYER(gPlayState);
+
+    if (gPlayState->sceneNum == SCENE_GERUDOS_FORTRESS && player->talkActor != NULL &&
+        player->talkActor->id == ACTOR_EN_GE2) {
+        CustomMessage msg =
+            CustomMessage("Want me to throw you in jail?&\x1B#Yes please&No thanks#",
+                          "Soll ich dich ins Gefängnis werfen?&\x1B#Ja, bitte&Nein, danke#",
+                          "Tu veux que je te jette en prison?&\x1B#Oui, s'il te plaît&Non merci#", { QM_GREEN });
+        msg.AutoFormat();
+        msg.LoadIntoFont();
+        *loadFromMessageTable = false;
+    }
+}
+
 void RegisterMiscellaneousMessages() {
     COND_ID_HOOK(OnOpenText, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI, IS_RANDO, BuildWaterSwitchMessage);
     COND_ID_HOOK(OnOpenText, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN, IS_RANDO, BuildWaterSwitchMessage);
@@ -60,6 +75,7 @@ void RegisterMiscellaneousMessages() {
     COND_ID_HOOK(OnOpenText, TEXT_MALON_MEET_EPONA, IS_RANDO, BuildFixedMallonAtCastleMessage);
     COND_ID_HOOK(OnOpenText, TEXT_MALON_EPONA_IS_AFRAID, IS_RANDO, BuildFixedMallonAtCastleMessage);
     COND_ID_HOOK(OnOpenText, TEXT_MALON_LETS_SING_THIS_SONG, IS_RANDO, BuildFixedMallonAtCastleMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_GERUDO_GUARD_FRIENDLY, IS_RANDO, BuildGerudoGuardJailOfferMessage);
 }
 
 static RegisterShipInitFunc initFunc(RegisterMiscellaneousMessages, { "IS_RANDO" });
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/Traps.cpp b/soh/soh/Enhancements/randomizer/Traps.cpp
index 7d6389222b..10892666a1 100644
--- a/soh/soh/Enhancements/randomizer/Traps.cpp
+++ b/soh/soh/Enhancements/randomizer/Traps.cpp
@@ -1705,7 +1705,7 @@ static const char* const frenchIceTrapMessages[] = {
     "Tu savais que le G de ZFG signifie #Glace#?",
     "Tu as obtenu #L'Âge de Glace (2002)#!",
     "Maintenant, tu peux lancer un #sort# que tu ne connais pas.",
-    "Que dirais-tu d'un héros #sur glace# ?",
+    "Que dirais-tu d'un héros #sur glace#?",
     "Pas de tunique pour #ça#!",
     "Je savais que tu étais #partiellement Metroid#!",
     "Voilà juste la #cerise sur le gâteau#!",
@@ -1726,7 +1726,7 @@ static const char* const frenchIceTrapMessages[] = {
     "#Continue#",
     "QU'EST-CE QU'ELLE VA FAIRE, ME FAIRE UNE #[Glace]#!?",
     "Tu as rencontré un #terrible destin#, n'est-ce pas?",
-    "Alors comme ça, tu aimes Shining ? Voici comment ça #finit#.",
+    "Alors comme ça, tu aimes Shining? Voici comment ça #finit#.",
     "Petite erreur de trajectoire. #Je gagne#.",
     "Prends ce #L#, @.",
     "#Problème de compétence#",