From f5c4948b4e16db22cb846165c70276050217a388 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Tue, 11 Mar 2025 23:37:02 -0400 Subject: [PATCH] Fix skulltula hint messages --- soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp | 2 +- soh/soh/Enhancements/randomizer/hint.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp index fdedbac47..80dd460bc 100644 --- a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp @@ -120,7 +120,7 @@ void BuildSkulltulaPeopleMessage(uint16_t* textId, bool* loadFromMessageTable) { } else { return; } - msg.AutoFormat(); + // msg.AutoFormat(); msg.LoadIntoFont(); *loadFromMessageTable = false; } diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp index 2648c4623..f0455de35 100644 --- a/soh/soh/Enhancements/randomizer/hint.cpp +++ b/soh/soh/Enhancements/randomizer/hint.cpp @@ -516,7 +516,7 @@ const HintText Hint::GetItemHintText(uint8_t slot, bool mysterious) const { } else if (!ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS) && targetRG == RG_ICE_TRAP) { //RANDOTODO store in item hint instead of item return HintText(CustomMessage({ctx->overrides[hintedCheck].GetTrickName()})); } else { - return ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetHint(); + return HintText(ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetName()); } }