diff options
| author | vaguerant <vaguerant@users.noreply.github.com> | 2022-06-07 09:16:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 19:16:47 -0400 |
| commit | 596d5b478bfbe5e7bcd389877ccd3815c3958721 (patch) | |
| tree | 11d2eda1db36aefd4c75f0ac7b5129bc8b9645f8 | |
| parent | f9c86c98219419c60a974ca7df1ee6fa946b4e3d (diff) | |
Fix Navi text HUD position (#406)
* Fix Navi text HUD position
* Force cvar to return 0 or 1
As suggested by Gary
* Disable all bug fixes by default
per Kenix
| -rw-r--r-- | libultraship/libultraship/SohImGuiImpl.cpp | 2 | ||||
| -rw-r--r-- | soh/soh/Enhancements/bootcommands.c | 5 | ||||
| -rw-r--r-- | soh/src/code/z_parameter.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp index 694ca6311..21a5cbdcf 100644 --- a/libultraship/libultraship/SohImGuiImpl.cpp +++ b/libultraship/libultraship/SohImGuiImpl.cpp @@ -936,6 +936,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..ff9e6dc98 100644 --- a/soh/soh/Enhancements/bootcommands.c +++ b/soh/soh/Enhancements/bootcommands.c @@ -26,9 +26,10 @@ void BootCommands_Init() CVar_RegisterS32("gPauseLiveLink", 0); CVar_RegisterS32("gMinimalUI", 0); CVar_RegisterS32("gRumbleEnabled", 0); - CVar_RegisterS32("gUniformLR", 1); + CVar_RegisterS32("gUniformLR", 0); CVar_RegisterS32("gTwoHandedIdle", 0); - CVar_RegisterS32("gDekuNutUpgradeFix", 1); + CVar_RegisterS32("gDekuNutUpgradeFix", 0); + CVar_RegisterS32("gNaviTextFix", 0); 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 a9e9e4f9e..14d677219 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2935,7 +2935,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) { |