From 9fdf72e82b5573ac08ce2448c901fbc166151759 Mon Sep 17 00:00:00 2001 From: nclok1405 <155463060+nclok1405@users.noreply.github.com> Date: Fri, 20 Jun 2025 16:02:57 +0900 Subject: [PATCH 1/6] * Add Overlay Text Font Size option and extends max Song Name Display Duration to 20 seconds * Solved conflict (2) --- soh/soh/Enhancements/audio/AudioEditor.cpp | 2 +- soh/soh/OTRGlobals.cpp | 27 ++++++++++++++++++++-- soh/soh/OTRGlobals.h | 2 ++ soh/soh/SohGui/SohMenuSettings.cpp | 16 +++++++++++++ 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index 4cf1f389d..2c167330b 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -546,7 +546,7 @@ void AudioEditor::DrawElement() { UIWidgets::CVarSliderInt("Overlay Duration: %d seconds", CVAR_AUDIO("SeqNameOverlayDuration"), UIWidgets::IntSliderOptions() .Min(1) - .Max(10) + .Max(20) .DefaultValue(5) .Size(ImVec2(300.0f, 0.0f)) .Color(THEME_COLOR)); diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index bc9b3106e..5991d7205 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -345,9 +345,8 @@ void OTRGlobals::Initialize() { context->InitWindow(sohFast3dWindow); auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); - overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Fipps", 32.0f, "fonts/Fipps-Regular.otf"); - overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P")); + LoadOverlayTextFont(); context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 }); @@ -513,6 +512,30 @@ void OTRGlobals::ScaleImGui() { previousImGuiScale = scale; } +void OTRGlobals::LoadOverlayTextFont() { + // TODO: Currenty, reloading a font causes crash. + auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); + float fontSize; + switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) { + case 0: + default: + fontSize = 12.0f; + break; + case 1: + fontSize = 24.0f; + break; + case 2: + fontSize = 32.0f; + break; + case 3: + fontSize = 40.0f; + break; + } + SPDLOG_DEBUG("Loading Overlay Text Font with size {}", fontSize); + overlay->LoadFont("Press Start 2P", fontSize, "fonts/PressStart2P-Regular.ttf"); + overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P")); +} + ImFont* OTRGlobals::CreateDefaultFontWithSize(float size) { auto mImGuiIo = &ImGui::GetIO(); ImFontConfig fontCfg = ImFontConfig(); diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h index cab7575cd..49e6ba337 100644 --- a/soh/soh/OTRGlobals.h +++ b/soh/soh/OTRGlobals.h @@ -72,6 +72,8 @@ class OTRGlobals { void ScaleImGui(); void Initialize(); + void LoadOverlayTextFont(); + bool HasMasterQuest(); bool HasOriginal(); uint32_t GetInterpolationFPS(); diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index bb7c82574..11965934a 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -56,6 +56,13 @@ static const std::unordered_map bootSequenceLabels = { { BOOTSEQUENCE_FILESELECT, "File Select" }, }; +static std::unordered_map overlayTextScaleOptions = { + { 0, "Small" }, + { 1, "Normal" }, + { 2, "Large" }, + { 3, "X-Large" }, +}; + const char* GetGameVersionString(uint32_t index) { uint32_t gameVersion = ResourceMgr_GetGameVersion(index); switch (gameVersion) { @@ -244,6 +251,15 @@ void SohMenu::AddMenuSettings() { .ComponentAlignment(ComponentAlignments::Right) .LabelPosition(LabelPositions::Far)) .Callback([](WidgetInfo& info) { OTRGlobals::Instance->ScaleImGui(); }); + AddWidget(path, "Overlay Text Size", WIDGET_CVAR_COMBOBOX) + .CVar(CVAR_SETTING("OverlayTextScale")) + .RaceDisable(false) + .Options(ComboboxOptions() + .ComboMap(overlayTextScaleOptions) + .Tooltip("Changes the font size of Overlay Text.\n(REQUIRES RESTART)") + .DefaultIndex(0) + .ComponentAlignment(ComponentAlignments::Right) + .LabelPosition(LabelPositions::Far)); // General - About path.column = SECTION_COLUMN_2; From 6502b35951d803e3b036b80b4d14900c7c4c0eca Mon Sep 17 00:00:00 2001 From: nclok1405 <155463060+nclok1405@users.noreply.github.com> Date: Fri, 20 Jun 2025 16:18:12 +0900 Subject: [PATCH 2/6] No longer require game restart, but in exchange all differently sized fonts need to be preloaded --- soh/soh/OTRGlobals.cpp | 19 ++++++++++--------- soh/soh/SohGui/SohMenuSettings.cpp | 5 +++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 5991d7205..730c08deb 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -346,6 +346,11 @@ void OTRGlobals::Initialize() { auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); overlay->LoadFont("Fipps", 32.0f, "fonts/Fipps-Regular.otf"); + // Currently, differently sized fonts require preloading (reloading font at runtime crashes the game) + overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Press Start 2P 24", 24.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Press Start 2P 32", 32.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Press Start 2P 40", 40.0f, "fonts/PressStart2P-Regular.ttf"); LoadOverlayTextFont(); context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 }); @@ -513,27 +518,23 @@ void OTRGlobals::ScaleImGui() { } void OTRGlobals::LoadOverlayTextFont() { - // TODO: Currenty, reloading a font causes crash. + // TODO: Is Fipps font used in somewhere? auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); - float fontSize; switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) { case 0: default: - fontSize = 12.0f; + overlay->SetCurrentFont("Press Start 2P"); break; case 1: - fontSize = 24.0f; + overlay->SetCurrentFont("Press Start 2P 24"); break; case 2: - fontSize = 32.0f; + overlay->SetCurrentFont("Press Start 2P 32"); break; case 3: - fontSize = 40.0f; + overlay->SetCurrentFont("Press Start 2P 40"); break; } - SPDLOG_DEBUG("Loading Overlay Text Font with size {}", fontSize); - overlay->LoadFont("Press Start 2P", fontSize, "fonts/PressStart2P-Regular.ttf"); - overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P")); } ImFont* OTRGlobals::CreateDefaultFontWithSize(float size) { diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index 11965934a..d08ac053d 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -256,10 +256,11 @@ void SohMenu::AddMenuSettings() { .RaceDisable(false) .Options(ComboboxOptions() .ComboMap(overlayTextScaleOptions) - .Tooltip("Changes the font size of Overlay Text.\n(REQUIRES RESTART)") + .Tooltip("Changes the font size of Overlay Text.") .DefaultIndex(0) .ComponentAlignment(ComponentAlignments::Right) - .LabelPosition(LabelPositions::Far)); + .LabelPosition(LabelPositions::Far)) + .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); // General - About path.column = SECTION_COLUMN_2; From 3db4d55676ca1eb2330e25e8a02ea4fed4de4a1e Mon Sep 17 00:00:00 2001 From: nclok1405 <155463060+nclok1405@users.noreply.github.com> Date: Fri, 20 Jun 2025 16:42:08 +0900 Subject: [PATCH 3/6] Add an option to use Fipps as overlay font. (Previously, this font was accesible only by manually editing "gSettings.OverlayFont" setting) --- soh/soh/OTRGlobals.cpp | 53 ++++++++++++++++++++++-------- soh/soh/SohGui/SohMenuSettings.cpp | 15 +++++++++ 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 730c08deb..4655761ed 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -345,12 +345,15 @@ void OTRGlobals::Initialize() { context->InitWindow(sohFast3dWindow); auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); - overlay->LoadFont("Fipps", 32.0f, "fonts/Fipps-Regular.otf"); // Currently, differently sized fonts require preloading (reloading font at runtime crashes the game) overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf"); - overlay->LoadFont("Press Start 2P 24", 24.0f, "fonts/PressStart2P-Regular.ttf"); - overlay->LoadFont("Press Start 2P 32", 32.0f, "fonts/PressStart2P-Regular.ttf"); - overlay->LoadFont("Press Start 2P 40", 40.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Press Start 2P Normal", 24.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Press Start 2P Large", 32.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Press Start 2P X-Large", 40.0f, "fonts/PressStart2P-Regular.ttf"); + overlay->LoadFont("Fipps", 24.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps Normal", 32.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps Large", 40.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps X-Large", 48.0f, "fonts/Fipps-Regular.otf"); LoadOverlayTextFont(); context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 }); @@ -518,21 +521,43 @@ void OTRGlobals::ScaleImGui() { } void OTRGlobals::LoadOverlayTextFont() { - // TODO: Is Fipps font used in somewhere? auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); - switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) { + + switch (CVarGetInteger(CVAR_SETTING("OverlayTextFont"), 0)) { case 0: default: - overlay->SetCurrentFont("Press Start 2P"); + switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) { + case 0: + default: + overlay->SetCurrentFont("Press Start 2P"); + break; + case 1: + overlay->SetCurrentFont("Press Start 2P Normal"); + break; + case 2: + overlay->SetCurrentFont("Press Start 2P Large"); + break; + case 3: + overlay->SetCurrentFont("Press Start 2P X-Large"); + break; + } break; case 1: - overlay->SetCurrentFont("Press Start 2P 24"); - break; - case 2: - overlay->SetCurrentFont("Press Start 2P 32"); - break; - case 3: - overlay->SetCurrentFont("Press Start 2P 40"); + switch (CVarGetInteger(CVAR_SETTING("OverlayTextScale"), 0)) { + case 0: + default: + overlay->SetCurrentFont("Fipps"); + break; + case 1: + overlay->SetCurrentFont("Fipps Normal"); + break; + case 2: + overlay->SetCurrentFont("Fipps Large"); + break; + case 3: + overlay->SetCurrentFont("Fipps X-Large"); + break; + } break; } } diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index d08ac053d..98fc33c02 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -63,6 +63,11 @@ static std::unordered_map overlayTextScaleOptions = { { 3, "X-Large" }, }; +static std::unordered_map overlayTextFontOptions = { + { 0, "Press Start 2P" }, + { 1, "Fipps" }, +}; + const char* GetGameVersionString(uint32_t index) { uint32_t gameVersion = ResourceMgr_GetGameVersion(index); switch (gameVersion) { @@ -261,6 +266,16 @@ void SohMenu::AddMenuSettings() { .ComponentAlignment(ComponentAlignments::Right) .LabelPosition(LabelPositions::Far)) .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); + AddWidget(path, "Overlay Text Font", WIDGET_CVAR_COMBOBOX) + .CVar(CVAR_SETTING("OverlayTextFont")) + .RaceDisable(false) + .Options(ComboboxOptions() + .ComboMap(overlayTextFontOptions) + .Tooltip("Changes the font of Overlay Text.") + .DefaultIndex(0) + .ComponentAlignment(ComponentAlignments::Right) + .LabelPosition(LabelPositions::Far)) + .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); // General - About path.column = SECTION_COLUMN_2; From c9398f804a03f918bd5e441167915a9ff4d4a78a Mon Sep 17 00:00:00 2001 From: nclok1405 <155463060+nclok1405@users.noreply.github.com> Date: Fri, 20 Jun 2025 17:47:44 +0900 Subject: [PATCH 4/6] Add Overlay Text Test Button --- soh/soh/SohGui/SohMenuSettings.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index 98fc33c02..a668b870e 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -115,6 +115,8 @@ extern "C" MessageTableEntry* sGerMessageEntryTablePtr; extern "C" MessageTableEntry* sFraMessageEntryTablePtr; extern "C" MessageTableEntry* sJpnMessageEntryTablePtr; +extern "C" void Overlay_DisplayText_Seconds(int seconds, const char* text); + static const std::array messageTables = { &sNesMessageEntryTablePtr, &sGerMessageEntryTablePtr, &sFraMessageEntryTablePtr, &sJpnMessageEntryTablePtr }; @@ -276,6 +278,10 @@ void SohMenu::AddMenuSettings() { .ComponentAlignment(ComponentAlignments::Right) .LabelPosition(LabelPositions::Far)) .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); + AddWidget(path, "Test Overlay Text", WIDGET_BUTTON) + .RaceDisable(false) + .Callback([](WidgetInfo& info) { Overlay_DisplayText_Seconds(5, "Overlay Text Test"); }) + .Options(ButtonOptions().Tooltip("Displays a test Overlay Text.")); // General - About path.column = SECTION_COLUMN_2; From a11cc4703a79ae7cde29497f390c54db89c8e2d9 Mon Sep 17 00:00:00 2001 From: nclok1405 <155463060+nclok1405@users.noreply.github.com> Date: Tue, 1 Jul 2025 17:24:14 +0900 Subject: [PATCH 5/6] Moved Overlay Text Settings to Notifications sidebar --- soh/soh/SohGui/SohMenuSettings.cpp | 51 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index a668b870e..7c5da5263 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -258,30 +258,6 @@ void SohMenu::AddMenuSettings() { .ComponentAlignment(ComponentAlignments::Right) .LabelPosition(LabelPositions::Far)) .Callback([](WidgetInfo& info) { OTRGlobals::Instance->ScaleImGui(); }); - AddWidget(path, "Overlay Text Size", WIDGET_CVAR_COMBOBOX) - .CVar(CVAR_SETTING("OverlayTextScale")) - .RaceDisable(false) - .Options(ComboboxOptions() - .ComboMap(overlayTextScaleOptions) - .Tooltip("Changes the font size of Overlay Text.") - .DefaultIndex(0) - .ComponentAlignment(ComponentAlignments::Right) - .LabelPosition(LabelPositions::Far)) - .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); - AddWidget(path, "Overlay Text Font", WIDGET_CVAR_COMBOBOX) - .CVar(CVAR_SETTING("OverlayTextFont")) - .RaceDisable(false) - .Options(ComboboxOptions() - .ComboMap(overlayTextFontOptions) - .Tooltip("Changes the font of Overlay Text.") - .DefaultIndex(0) - .ComponentAlignment(ComponentAlignments::Right) - .LabelPosition(LabelPositions::Far)) - .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); - AddWidget(path, "Test Overlay Text", WIDGET_BUTTON) - .RaceDisable(false) - .Callback([](WidgetInfo& info) { Overlay_DisplayText_Seconds(5, "Overlay Text Test"); }) - .Options(ButtonOptions().Tooltip("Displays a test Overlay Text.")); // General - About path.column = SECTION_COLUMN_2; @@ -477,6 +453,7 @@ void SohMenu::AddMenuSettings() { path.sidebarName = "Notifications"; path.column = SECTION_COLUMN_1; AddSidebarEntry("Settings", path.sidebarName, 3); + AddWidget(path, "Notifications Settings", WIDGET_SEPARATOR_TEXT); AddWidget(path, "Position", WIDGET_CVAR_COMBOBOX) .CVar(CVAR_SETTING("Notifications.Position")) .RaceDisable(false) @@ -522,6 +499,32 @@ void SohMenu::AddMenuSettings() { }); }) .Options(ButtonOptions().Tooltip("Displays a test notification.")); + + AddWidget(path, "Overlay Text Settings", WIDGET_SEPARATOR_TEXT); + AddWidget(path, "Overlay Text Size:", WIDGET_CVAR_COMBOBOX) + .CVar(CVAR_SETTING("OverlayTextScale")) + .RaceDisable(false) + .Options(ComboboxOptions() + .ComboMap(overlayTextScaleOptions) + .Tooltip("Changes the font size of Overlay Text.") + .DefaultIndex(0) + .ComponentAlignment(ComponentAlignments::Right) + .LabelPosition(LabelPositions::Far)) + .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); + AddWidget(path, "Overlay Text Font:", WIDGET_CVAR_COMBOBOX) + .CVar(CVAR_SETTING("OverlayTextFont")) + .RaceDisable(false) + .Options(ComboboxOptions() + .ComboMap(overlayTextFontOptions) + .Tooltip("Changes the font type of Overlay Text.") + .DefaultIndex(0) + .ComponentAlignment(ComponentAlignments::Right) + .LabelPosition(LabelPositions::Far)) + .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); + AddWidget(path, "Test Overlay Text", WIDGET_BUTTON) + .RaceDisable(false) + .Callback([](WidgetInfo& info) { Overlay_DisplayText_Seconds(5, "Overlay Text Test"); }) + .Options(ButtonOptions().Tooltip("Displays a test Overlay Text.")); } } // namespace SohGui From ea1c741fe76fc612ad679f7756c6f50f4593dc58 Mon Sep 17 00:00:00 2001 From: nclok1405 <155463060+nclok1405@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:45:32 +0900 Subject: [PATCH 6/6] Made Fipps larger --- soh/soh/OTRGlobals.cpp | 11 ++++++----- soh/soh/SohGui/SohMenuSettings.cpp | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 4655761ed..e5b9bb1f4 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -345,15 +345,16 @@ void OTRGlobals::Initialize() { context->InitWindow(sohFast3dWindow); auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay(); - // Currently, differently sized fonts require preloading (reloading font at runtime crashes the game) + // Currently, differently sized fonts require preloading + // (loading a font at any point after here crashes the game with "INVALID ACCESS TO STORAGE") overlay->LoadFont("Press Start 2P", 12.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P Normal", 24.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P Large", 32.0f, "fonts/PressStart2P-Regular.ttf"); overlay->LoadFont("Press Start 2P X-Large", 40.0f, "fonts/PressStart2P-Regular.ttf"); - overlay->LoadFont("Fipps", 24.0f, "fonts/Fipps-Regular.otf"); - overlay->LoadFont("Fipps Normal", 32.0f, "fonts/Fipps-Regular.otf"); - overlay->LoadFont("Fipps Large", 40.0f, "fonts/Fipps-Regular.otf"); - overlay->LoadFont("Fipps X-Large", 48.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps", 32.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps Normal", 40.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps Large", 48.0f, "fonts/Fipps-Regular.otf"); + overlay->LoadFont("Fipps X-Large", 52.0f, "fonts/Fipps-Regular.otf"); LoadOverlayTextFont(); context->InitAudio({ .SampleRate = 32000, .SampleLength = 1024, .DesiredBuffered = 1680 }); diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index 7c5da5263..f54017764 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -514,12 +514,13 @@ void SohMenu::AddMenuSettings() { AddWidget(path, "Overlay Text Font:", WIDGET_CVAR_COMBOBOX) .CVar(CVAR_SETTING("OverlayTextFont")) .RaceDisable(false) - .Options(ComboboxOptions() - .ComboMap(overlayTextFontOptions) - .Tooltip("Changes the font type of Overlay Text.") - .DefaultIndex(0) - .ComponentAlignment(ComponentAlignments::Right) - .LabelPosition(LabelPositions::Far)) + .Options( + ComboboxOptions() + .ComboMap(overlayTextFontOptions) + .Tooltip("Changes the font type of Overlay Text.\nNote: Fipps is generally smaller than Press Start 2P") + .DefaultIndex(0) + .ComponentAlignment(ComponentAlignments::Right) + .LabelPosition(LabelPositions::Far)) .Callback([](WidgetInfo& info) { OTRGlobals::Instance->LoadOverlayTextFont(); }); AddWidget(path, "Test Overlay Text", WIDGET_BUTTON) .RaceDisable(false)