From 865602c2a85df5822eb169626694bbcec2f4d36d Mon Sep 17 00:00:00 2001
From: pizza1398 <259104093+pizza1398@users.noreply.github.com>
Date: Thu, 23 Jul 2026 21:51:06 +0200
Subject: [PATCH] Fix Clock Door SoT Hint logic

- Fix crash when determining first Clock Door hint
- Put Remains hints after Ocarina's if SoT isn't shuffled
- Only play Tatl sound on SoT hint if it was first
---
 source/hints.cpp | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/source/hints.cpp b/source/hints.cpp
index 4aab982..8d8234e 100644
--- a/source/hints.cpp
+++ b/source/hints.cpp
@@ -846,24 +846,12 @@ void CreateClockTowerDoorHints() {
       break;
   }
 
-  CustomMessages::CreateMessage(0x0630, (StartingOcarina.Value<u8>() == 0) ? 0x8000 : 0x8003, 0x3FFFFFFF, 0x0FF0211,
-    {"Rooftop access strictly prohibited!&(Enforceable until #midnight# on the&#eve# of the carnival.)^"
-    "#Notice of carnival activities:#&Musical Performance Contest&Unique Mask Contest&#Prizes available!#",
-      // French
-      "Accès aux toits strictement&interdit jusqu'à #minuit#, la&#veille #du carnaval.^"
-      "#Notice d'activités du carnaval:#&Concours de performance musicale&Concours de masques singuliers&#Prix à la clé!#",
-      // Spanish
-      "Acceso al tejado.&¡Prohibida la entrada hasta&la #medianoche de la víspera&#del carnaval!^"
-      "**SPANISH**",
-      // // German
-      // "Zugang zum Dach&Betreten streng verboten!&(bis um #Mitternacht# am&Vorabend des #Karnevals#)^"
-      // "**GERMAN**",
-      // // Italian
-      // "Porta del tetto&Ingresso vietato fino alla&#mezzanotte# della #vigilia# del&carnevale.^"
-      // "**ITALIAN**",
-    },
-    {QM_RED, QM_RED, QM_RED, QM_MAGENTA}, {}, {}, 0x0, false, false);
-  CustomMessages::CreateMessage(0x0630, (ShuffleSongOfTime.Value<u8>() == 1) ? 0x8000 : 0x8003, 0x3FFFFFFF, 0x0FF0211,
+  // Determine which hint to display first
+  u16 clockDoorFirstHint = 0x8003;
+  if (StartingOcarina.Value<u8>() == 0) clockDoorFirstHint = 0x8000;
+  else if (ShuffleSongOfTime) clockDoorFirstHint = 0x8001;
+
+  CustomMessages::CreateMessage(0x0630, clockDoorFirstHint, 0x3FFFFFFF, 0x0FF0211,
     {"Rooftop access strictly prohibited!&(Enforceable until #midnight# on the&#eve# of the carnival.)^"
     "#Notice of carnival activities:#&Musical Performance Contest&Unique Mask Contest&#Prizes available!#",
       // French
@@ -880,8 +868,8 @@ void CreateClockTowerDoorHints() {
       // "**ITALIAN**",
     },
     {QM_RED, QM_RED, QM_RED, QM_MAGENTA}, {}, {}, 0x0, false, false);
-  CustomMessages::CreateMessageFromTextObject(0x8000, 0x8001, 0x3FFFFFFF, 0x1000000, ocarinaHint, {QM_BLUE, QM_RED}, {}, {}, 0x083E, false, false);
-  CustomMessages::CreateMessageFromTextObject(0x8001, 0x8002, 0x3FFFFFFF, 0x1000000, songTimeHint, {QM_BLUE, QM_RED}, {}, {}, 0x083E, false, false);
+  CustomMessages::CreateMessageFromTextObject(0x8000, ShuffleSongOfTime ? 0x8001 : 0x8002, 0x3FFFFFFF, 0x1000000, ocarinaHint, {QM_BLUE, QM_RED}, {}, {}, 0x083E, false, false);
+  CustomMessages::CreateMessageFromTextObject(0x8001, 0x8002, 0x3FFFFFFF, 0x1000000, songTimeHint, {QM_BLUE, QM_RED}, {}, {}, (clockDoorFirstHint == 0x8001) ? 0x083E : 0x0, false, false);
   CustomMessages::CreateMessage(0x8002, 0x8004, 0x3FFFFFFF, 0x1FF0000,
     {"Also, that #mask competition# sounds interesting! I've heard rumours of some pretty #rare masks# around here, truly one of a kind stuff!",
       // French