From 3f2a40a4cc05eb14ef40840ebf43df9faf091a12 Mon Sep 17 00:00:00 2001 From: Vague Rant Date: Tue, 24 May 2022 00:23:51 +1000 Subject: [PATCH] Fix Navi text HUD position --- libultraship/libultraship/SohImGuiImpl.cpp | 2 ++ soh/soh/Enhancements/bootcommands.c | 1 + soh/src/code/z_parameter.c | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp index 5ea017173..db79a354f 100644 --- a/libultraship/libultraship/SohImGuiImpl.cpp +++ b/libultraship/libultraship/SohImGuiImpl.cpp @@ -753,6 +753,8 @@ namespace SohImGui { Tooltip("Makes two handed idle animation play, a seemingly finished animation that was disabled on accident in the original game"); EnhancementCheckbox("Fix Deku Nut upgrade", "gDekuNutUpgradeFix"); Tooltip("Prevents the Forest Stage Deku Nut upgrade from becoming unobtainable after receiving the Poacher's Saw"); + EnhancementCheckbox("Fix Navi text HUD position", "gNaviTextFix"); + Tooltip("Correctly centers the Navi text prompt on the HUD's C-Up button"); ImGui::EndMenu(); } diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c index fa6db7487..1b1e7043e 100644 --- a/soh/soh/Enhancements/bootcommands.c +++ b/soh/soh/Enhancements/bootcommands.c @@ -29,6 +29,7 @@ void BootCommands_Init() CVar_RegisterS32("gUniformLR", 1); CVar_RegisterS32("gTwoHandedIdle", 0); CVar_RegisterS32("gDekuNutUpgradeFix", 1); + CVar_RegisterS32("gNaviTextFix", 1); CVar_RegisterS32("gNewDrops", 0); CVar_RegisterS32("gVisualAgony", 0); CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index dcfcdb05b..505bc24ee 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2916,7 +2916,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } const s16 rCUpBtnX = OTRGetRectDimensionFromRightEdge(R_C_UP_BTN_X+Right_HUD_Margin); - const s16 rCUPIconX = OTRGetRectDimensionFromRightEdge(R_C_UP_ICON_X+Right_HUD_Margin); + const s16 rCUPIconX = OTRGetRectDimensionFromRightEdge(R_C_UP_ICON_X+Right_HUD_Margin-CVar_GetS32("gNaviTextFix", 0)); if (CVar_GetS32("gHudColors", 1) == 0) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), temp); } else if (CVar_GetS32("gHudColors", 1) == 1) {