From 3174545749e2b40fdaccc598fe813fee8bceacb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <serprex@users.noreply.github.com>
Date: Sun, 8 Mar 2026 02:35:08 +0000
Subject: [PATCH] Fix Ganondorf hint formatting (#6331)

---
 .../Enhancements/randomizer/Messages/StaticHints.cpp  |  1 -
 soh/soh/Enhancements/randomizer/hint.cpp              | 11 +++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
index 4bc2a7b7f..6f163c58d 100644
--- a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
@@ -38,7 +38,6 @@ void BuildGanondorfHint(uint16_t* textId, bool* loadFromMessageTable) {
             msg = RAND_GET_HINT(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
         }
     }
-    msg.AutoFormat();
     msg.LoadIntoFont();
     *loadFromMessageTable = false;
 }
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index c99c71b94..8075b72be 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -130,14 +130,8 @@ void Hint::FillGapsInData() {
     if (locations.size() == 0 && StaticData::staticHintInfoMap.contains(ownKey)) {
         locations = StaticData::staticHintInfoMap[ownKey].targetChecks;
     }
-    bool fillAreas = true;
-    bool fillItems = true;
-    if (areas.size() > 0) {
-        fillAreas = false;
-    }
-    if (items.size() > 0) {
-        fillItems = false;
-    }
+    bool fillAreas = areas.size() == 0;
+    bool fillItems = items.size() == 0;
     for (uint8_t c = 0; c < locations.size(); c++) {
         // if area matters for the hint, it should be specified and not left to this
         if (fillAreas) {
@@ -205,6 +199,7 @@ void Hint::NamesChosen() {
         hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT) {
         namesTemp = {};
         saveNames = false;
+
         for (uint8_t c = 0; c < areas.size(); c++) {
             uint8_t selection = GetRandomHintTextEntry(GetAreaHintText(c));
             if (selection > 0) {