From 8d4b15325a5d60dddc9f3e96a215e731a1871940 Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Mon, 13 Jun 2022 18:15:26 +0200 Subject: [PATCH] ADD: Color for the bottom text --- libultraship/libultraship/SohImGuiImpl.cpp | 5 ++++- .../overlays/gamestates/ovl_file_choose/z_file_choose.c | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp index a4aa1e947..491dd8938 100644 --- a/libultraship/libultraship/SohImGuiImpl.cpp +++ b/libultraship/libultraship/SohImGuiImpl.cpp @@ -77,6 +77,7 @@ namespace SohImGui { ImVec4 rupee_colors; ImVec4 smolekey_colors; ImVec4 fileselect_colors; + ImVec4 fileselect_text_colors; ImVec4 kokiri_col; ImVec4 goron_col; ImVec4 zora_col; @@ -96,7 +97,7 @@ namespace SohImGui { "gCCABtnPrim","gCCBBtnPrim","gCCCBtnPrim","gCCStartBtnPrim", "gCCMagicBorderPrim","gCCMagicPrim","gCCMagicUsePrim", "gCCMinimapPrim","gCCRupeePrim","gCCKeysPrim", - "gCCFileChoosePrim" + "gCCFileChoosePrim", "gCCFileChooseTextPrim" }; const char* filters[3] = { @@ -1273,6 +1274,8 @@ namespace SohImGui { EnhancementColor("File Choose color", "gCCFileChoosePrim", fileselect_colors, ImVec4(100, 150, 255, 255)); Tooltip("Affect the File Select."); ImGui::Separator(); + EnhancementColor("Bottom text color", "gCCFileChooseTextPrim", fileselect_text_colors, ImVec4(0, 100, 255, 255)); + Tooltip("Affect the File Select."); ImGui::EndTabItem(); } ImGui::EndTabBar(); diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 1b5e42432..2dd441de3 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -1768,7 +1768,14 @@ void FileChoose_Main(GameState* thisx) { gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 100, 255, 255, this->controlsAlpha); + + if (CVar_GetS32("gHudColors", 1) == 2) { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetS32("gCCFileChooseTextPrimR", 0), + CVar_GetS32("gCCFileChooseTextPrimG", 100), CVar_GetS32("gCCFileChooseTextPrimB", 255), + this->controlsAlpha); + } else { + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 100, 255, 255, this->controlsAlpha); + } gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); gDPLoadTextureBlock(POLY_OPA_DISP++, controlsTextures[gSaveContext.language], G_IM_FMT_IA, G_IM_SIZ_8b, 144, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,