Cosmetics texts fixes (#604)

* branch init + few fixes

* Reset button

* Several texts fixes and default color to GameCube

* space issues

* some more extra space that was not needed.

* space yes last time ...

* Arrows being able to be rainbow some more texts fixes

* more texts fixes

* c-buttons some plurial fix

libultraship/libultraship/ImGuiImpl.cpp

@@ -69,7 +69,9 @@ namespace SohImGui {
     const char* RainbowColorCvarList[] = {
         //This is the list of possible CVars that has rainbow effect.
         "gTunic_Kokiri_", "gTunic_Goron_", "gTunic_Zora_",
-        "gCCHeartsPrim", "gDDCCHeartsPrim", "gCCDDHeartsPrim",
+        "gFireArrowCol", "gIceArrowCol", "gTunic_Zora_",
+        "gFireArrowColEnv", "gIceArrowColEnv", "gLightArrowColEnv",
+        "gCCHeartsPrim", "gDDCCHeartsPrim", "gLightArrowCol",
         "gCCABtnPrim", "gCCBBtnPrim", "gCCCBtnPrim", "gCCStartBtnPrim",
         "gCCCUBtnPrim", "gCCCLBtnPrim", "gCCCRBtnPrim", "gCCCDBtnPrim", "gCCDpadPrim",
         "gCCMagicBorderNormPrim", "gCCMagicBorderPrim", "gCCMagicPrim", "gCCMagicUsePrim",
@@ -588,7 +590,7 @@ namespace SohImGui {
             CVar_SetS32(Cvar_RBM.c_str(), 0); //On click disable rainbow mode.
             needs_save = true;
         }
-        Tooltip("Clicking this button will make a random color for the colors at it's right.\nPrevious color will be overwrite and will not be recoverable");
+        Tooltip("Chooses a random color\nOverwrites previously chosen color");
     }
 
     void RainbowColor(const char* cvarName, ImVec4* colors) {
@@ -600,7 +602,7 @@ namespace SohImGui {
         MakeInvisible += "Rainbow";
 
         EnhancementCheckbox(MakeInvisible.c_str(), Cvar_RBM.c_str());
-        Tooltip("Clicking this button will make color cycling\nPrevious color will be overwrite and will not be recoverable");
+        Tooltip("Cycles through colors on a timer\nOverwrites previously chosen color");
     }
 
     void ResetColor(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha) {
@@ -630,7 +632,7 @@ namespace SohImGui {
             CVar_SetS32(Cvar_RBM.c_str(), 0); //On click disable rainbow mode.
             needs_save = true;
         }
-        Tooltip("Clicking this button will to the game original color (GameCube version)\nPrevious color will be overwrite and will not be recoverable");
+        Tooltip("Revert colors to the game original colors (GameCube version)\nOverwrites previously chosen color");
     }
 
     void EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow, bool has_alpha, bool TitleSameLine) {

soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp

@@ -111,7 +111,7 @@ void Draw_HelpIcon(const std::string& helptext, bool sameline = true, int Pos =
 }
 void Draw_Npcs(){
     SohImGui::EnhancementCheckbox("Custom colors for Navi", "gUseNaviCol");
-    SohImGui::Tooltip("Enable/Disable custom Navi's colors. \nIf disabled you will have original colors for Navi.\nColors are refreshed when Navi goes back in your pockets.");
+    SohImGui::Tooltip("Enable/Disable custom Navi colors\nIf disabled, default colors will be used\nColors go into effect when Navi goes back into your pockets");
     if (CVar_GetS32("gUseNaviCol",0) && ImGui::BeginTable("tableNavi", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
         ImGui::TableSetupColumn("Inner colors##Navi", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         ImGui::TableSetupColumn("Outer colors##Navi", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
@@ -141,53 +141,54 @@ void Draw_Npcs(){
         SohImGui::EnhancementColor("Navi Prop", "gNavi_Prop_Outer_", navi_prop_o_col, ImVec4(0, 255, 0, 255), false);
         ImGui::EndTable();
     }
-    SohImGui::EnhancementCheckbox("Custom colors for Keeses", "gUseKeeseCol");
+    SohImGui::EnhancementCheckbox("Custom colors for Keese", "gUseKeeseCol");
-    SohImGui::Tooltip("Enable/Disable custom Keese's elements colors. \nIf disabled you will have original element colors for Keese.\nColors are refreshed when Keese respawn (can be room reload).");
+    SohImGui::Tooltip("Enable/Disable custom Keese element colors\nIf disabled, default element colors will be used\nColors go into effect when Keese respawn (or when the room is reloaded)");
     if (CVar_GetS32("gUseKeeseCol",0) && ImGui::BeginTable("tableKeese", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
         ImGui::TableSetupColumn("Fire colors##Keese", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         ImGui::TableSetupColumn("Ice colors##Keese", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         Table_InitHeader(false);
-        Draw_HelpIcon("Affect the primary color of the Fire itself of the Keese");
+        Draw_HelpIcon("Affects the primary color of the Fire itself of the Keese");
         SohImGui::EnhancementColor("Fire Primary color", "gKeese1_Ef_Prim", Keese1_primcol, ImVec4(255, 255, 100, 255));
         Table_NextCol();
-        Draw_HelpIcon("Affect the primary color of the Ice itself of the Keese");
+        Draw_HelpIcon("Affects the primary color of the Ice itself of the Keese");
         SohImGui::EnhancementColor("Fire Primary color", "gKeese2_Ef_Prim", Keese2_primcol, ImVec4(100, 200, 255, 255));
         Table_NextLine();
-        Draw_HelpIcon("Affect the secondary color of the Fire itself of the Keese");
+        Draw_HelpIcon("Affects the secondary color of the Fire itself of the Keese");
         SohImGui::EnhancementColor("Ice Secondary color", "gKeese1_Ef_Env", Keese1_envcol, ImVec4(255, 50, 0, 255));
         Table_NextCol();
-        Draw_HelpIcon("Affect the secondary color of the Ice itself of the Keese");
+        Draw_HelpIcon("Affects the secondary color of the Ice itself of the Keese");
         SohImGui::EnhancementColor("Ice Secondary color", "gKeese2_Ef_Env", Keese2_envcol, ImVec4(0, 0, 255, 255));
         ImGui::EndTable();
     }
     SohImGui::EnhancementCheckbox("Custom colors for Dogs", "gUseDogsCol");
+    SohImGui::Tooltip("Enable/Disable custom colors for the two Dog variants\nIf disabled, default colors will be used");
     if (CVar_GetS32("gUseDogsCol",0) && ImGui::BeginTable("tableDogs", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
         ImGui::TableSetupColumn("Dog N.1 color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         ImGui::TableSetupColumn("Dog N.2 color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         Table_InitHeader();
-        Draw_HelpIcon("Affect the colors of the white dog");
+        Draw_HelpIcon("Affects the colors of the white dog");
         SohImGui::EnhancementColor("Dog white", "gDog1Col", doggo1col, ImVec4(255,255,200,255), true, false, true);
         Table_NextCol();
-        Draw_HelpIcon("Affect the colors of the brown dog");
+        Draw_HelpIcon("Affects the colors of the brown dog");
         SohImGui::EnhancementColor("Dog brown", "gDog2Col", doggo2col, ImVec4(150,100,50,255), true, false, true);
         ImGui::EndTable();
     }
 }
 void Draw_ItemsSkills(){
     SohImGui::EnhancementCheckbox("Custom tunics color", "gUseTunicsCol");
-    SohImGui::Tooltip("Enable/Disable custom Link's tunics colors. \nIf disabled you will have original colors for Link's tunics.");
+    SohImGui::Tooltip("Enable/Disable custom Link's tunics colors\nIf disabled you will have original colors for Link's tunics.");
     if (CVar_GetS32("gUseTunicsCol",0) && ImGui::BeginTable("tableTunics", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
         ImGui::TableSetupColumn("Kokiri Tunic", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/3);
         ImGui::TableSetupColumn("Goron Tunic", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/3);
         ImGui::TableSetupColumn("Zora Tunic", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/3);
         Table_InitHeader();
-        Draw_HelpIcon("Affect Kokiri Tunic colors", false);
+        Draw_HelpIcon("Affects Kokiri Tunic color", false);
         SohImGui::EnhancementColor("Kokiri Tunic", "gTunic_Kokiri_", kokiri_col, ImVec4(30, 105, 27, 255), true, false, true);
         Table_NextCol();
-        Draw_HelpIcon("Affect Goron Tunic colors", false);
+        Draw_HelpIcon("Affects Goron Tunic color", false);
         SohImGui::EnhancementColor("Goron Tunic", "gTunic_Goron_", goron_col, ImVec4(100, 20, 0, 255), true, false, true);
         Table_NextCol();
-        Draw_HelpIcon("Affect Zora Tunic colors", false);
+        Draw_HelpIcon("Affects Zora Tunic color", false);
         SohImGui::EnhancementColor("Zora Tunic", "gTunic_Zora_", zora_col, ImVec4(0, 60, 100, 255), true, false, true);
         ImGui::EndTable();
     }
@@ -196,22 +197,22 @@ void Draw_ItemsSkills(){
         ImGui::TableSetupColumn("Primary colors##Arrows", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         ImGui::TableSetupColumn("Env colors##Arrows", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         Table_InitHeader();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
         SohImGui::EnhancementColor("Fire Arrows (primary)", "gFireArrowCol", firearrow_col, ImVec4(255,200,0,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
         SohImGui::EnhancementColor("Fire Arrows", "gFireArrowColEnv", firearrow_colenv, ImVec4(255,0,0,255));
         Table_NextLine();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
         SohImGui::EnhancementColor("Ice Arrows (primary)", "gIceArrowCol", icearrow_col, ImVec4(170,255,255,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
         SohImGui::EnhancementColor("Ice Arrows", "gIceArrowColEnv", icearrow_colenv, ImVec4(0,0,255,255));
         Table_NextLine();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
         SohImGui::EnhancementColor("Light Arrows (primary)", "gLightArrowCol", lightarrow_col, ImVec4(255,255,170,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
         SohImGui::EnhancementColor("Light Arrows", "gLightArrowColEnv", lightarrow_colenv, ImVec4(255,255,0,255));
         ImGui::EndTable();
     }
@@ -220,22 +221,22 @@ void Draw_ItemsSkills(){
         ImGui::TableSetupColumn("Inner colors##Spells", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         ImGui::TableSetupColumn("Outer colors##Spells", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         Table_InitHeader();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
         SohImGui::EnhancementColor("Din's Fire (primary)", "gDF_Col", df_col, ImVec4(255,200,0,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
         SohImGui::EnhancementColor("Din's Fire", "gDF_Env", df_colenv, ImVec4(255,0,0,255));
         Table_NextLine();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
         SohImGui::EnhancementColor("Nayru's Love Diamond (primary)", "gNL_Diamond_Col", nl_diam_col, ImVec4(170,255,255,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
         SohImGui::EnhancementColor("Nayru's Love Diamond", "gNL_Diamond_Env", nl_diam_colenv, ImVec4(100,255,128,255));
         Table_NextLine();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
         SohImGui::EnhancementColor("Nayru's Love Orb (primary)", "gNL_Orb_Col", nl_orb_col, ImVec4(170,255,255,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
         SohImGui::EnhancementColor("Nayru's Love Orb", "gNL_Orb_Env", nl_orb_colenv, ImVec4(150,255,255,255));
         ImGui::EndTable();
     }
@@ -244,25 +245,25 @@ void Draw_ItemsSkills(){
         ImGui::TableSetupColumn("Primary colors##Charge", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         ImGui::TableSetupColumn("Env colors##Charge", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
         Table_InitHeader();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
-        SohImGui::EnhancementColor("Level 1 colors (primary)", "gCharged1Col", charged1_col, ImVec4(170,255,255,255));
+        SohImGui::EnhancementColor("Level 1 color (primary)", "gCharged1Col", charged1_col, ImVec4(170,255,255,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
-        SohImGui::EnhancementColor("Level 1 colors", "gCharged1ColEnv", charged1_colenv, ImVec4(0,100,255,255));
+        SohImGui::EnhancementColor("Level 1 color", "gCharged1ColEnv", charged1_colenv, ImVec4(0,100,255,255));
         Table_NextLine();
-        Draw_HelpIcon("Affect Primary colors");
+        Draw_HelpIcon("Affects Primary color");
-        SohImGui::EnhancementColor("Level 2 colors (primary)", "gCharged2Col", charged2_col, ImVec4(255,255,170,255));
+        SohImGui::EnhancementColor("Level 2 color (primary)", "gCharged2Col", charged2_col, ImVec4(255,255,170,255));
         Table_NextCol();
-        Draw_HelpIcon("Affect Secondary colors");
+        Draw_HelpIcon("Affects Secondary color");
-        SohImGui::EnhancementColor("Level 2 colors", "gCharged2ColEnv", charged2_colenv, ImVec4(255,100,0,255));
+        SohImGui::EnhancementColor("Level 2 color", "gCharged2ColEnv", charged2_colenv, ImVec4(255,100,0,255));
         ImGui::EndTable();
     }
     SohImGui::EnhancementCheckbox("Custom sword trails color", "gUseTrailsCol");
     if (CVar_GetS32("gUseTrailsCol",0) && ImGui::BeginTable("tabletrails", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
         ImGui::TableSetupColumn("Custom Swords trails", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
         Table_InitHeader();
-        Draw_HelpIcon("Affect Slash trails colors");
+        Draw_HelpIcon("Affects Slash trails color");
-        SohImGui::EnhancementColor("Trails colors", "gTrailCol", trailscol, ImVec4(255,255,255,255));
+        SohImGui::EnhancementColor("Trails color", "gTrailCol", trailscol, ImVec4(255,255,255,255));
         SohImGui::EnhancementSliderInt("Trails duration: %dx", "##TrailsMul", "gTrailDurantion", 1, 5, "");
         SohImGui::Tooltip("The longer the trails the weirder it become");
         ImGui::NewLine();
@@ -270,15 +271,16 @@ void Draw_ItemsSkills(){
     }
 }
 void Draw_Menus(){
+    if (CVar_GetS32("gHudColors",0) ==2 ){
         if (ImGui::BeginTable("tableFileChoose", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
             ImGui::TableSetupColumn("File Choose color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
             ImGui::TableSetupColumn("Bottom text color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
             Table_InitHeader();
-        Draw_HelpIcon("Affect the File Select menu background.");
+            Draw_HelpIcon("Affects the File Select menu background.");
             SohImGui::EnhancementColor("File Choose color", "gCCFileChoosePrim", fileselect_colors, ImVec4(100, 150, 255, 255), true, false, true);
             Table_NextCol();
-        Draw_HelpIcon("Affect the File Select texts.");
+            Draw_HelpIcon("Affects the File Select texts.");
-        SohImGui::EnhancementColor("Bottom text color", "gCCFileChooseTextPrim", fileselect_text_colors, ImVec4(0, 100, 255, 255), true, false, true);
+            SohImGui::EnhancementColor("Bottom text color", "gCCFileChooseTextPrim", fileselect_text_colors, ImVec4(100, 255, 255, 255), true, false, true);
             ImGui::EndTable();
         }
         /*
@@ -305,6 +307,9 @@ void Draw_Menus(){
             ImGui::EndTable();
         }
         */
+    } else {
+        ImGui::Text("To modify menus colors you need \"Custom Colors\" scheme\nto be selected in \"General\" tab.\nOnce enabled you will be able to modify the following colors:\nFile Choose color\nBottom text color");
+    }
 }
 void Draw_Placements(){
     if (ImGui::BeginTable("tableMargins", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
@@ -825,47 +830,48 @@ void Draw_Placements(){
     }
 }
 void Draw_HUDButtons(){
+    if (CVar_GetS32("gHudColors",0) ==2 ){
         if (ImGui::CollapsingHeader("A Button colors & A Cursors")) {
             if (ImGui::BeginTable("tableBTN_A", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-            ImGui::TableSetupColumn("Button A colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
+                ImGui::TableSetupColumn("A Button colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader(false);
-            Draw_HelpIcon("Affect Button A colors (and various cursors that use the same theme)", false);
+                Draw_HelpIcon("Affects the A button colors (and various cursors that use the same theme)", false);
-            SohImGui::EnhancementColor("A Buttons", "gCCABtnPrim", a_btn_colors, ImVec4(90, 90, 255, 255), true, false, true);
+                SohImGui::EnhancementColor("A Buttons", "gCCABtnPrim", a_btn_colors, ImVec4(0, 200, 50, 255), true, false, true);
                 ImGui::EndTable();
             }
         }
-    if (ImGui::CollapsingHeader("B Button colors")) {
+        if (ImGui::CollapsingHeader("B Button color")) {
             if (ImGui::BeginTable("tableBTN_B", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-            ImGui::TableSetupColumn("Button B colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
+                ImGui::TableSetupColumn("B button color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader(false);
-            Draw_HelpIcon("Affect Button B colors", false);
+                Draw_HelpIcon("Affects the B button color", false);
-            SohImGui::EnhancementColor("B Buttons", "gCCBBtnPrim", b_btn_colors, ImVec4(0, 150, 0, 255), true, false, true);
+                SohImGui::EnhancementColor("B Button", "gCCBBtnPrim", b_btn_colors, ImVec4(255, 30, 30, 255), true, false, true);
                 ImGui::EndTable();
             }
         }
-    if (ImGui::CollapsingHeader("C Buttons & C Cursor")) {
+        if (ImGui::CollapsingHeader("C-Buttons & C Cursor")) {
             if (ImGui::BeginTable("tableBTN_C", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
                 ImGui::TableSetupColumn("Button C colors & C Cursor colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader(false);
-            Draw_HelpIcon("Affect Button C Buttons colors (if not using separated colors)\nAnd various cursor that use C Button colors", false);
+                Draw_HelpIcon("Affects the C Buttons' color (if not using separate colors)\nAnd various cursor that use C-Buttons colors", false);
-            SohImGui::EnhancementColor("C Buttons", "gCCCBtnPrim", c_btn_colors, ImVec4(255, 160, 0, 255), true, false, true);
+                SohImGui::EnhancementColor("C-Buttons", "gCCCBtnPrim", c_btn_colors, ImVec4(255, 160, 0, 255), true, false, true);
                 ImGui::EndTable();
             }
-        SohImGui::EnhancementCheckbox("C Buttons use separated colors", "gCCparated");
+            SohImGui::EnhancementCheckbox("C-Buttons use separate colors", "gCCparated");
             if (CVar_GetS32("gCCparated",0) && ImGui::CollapsingHeader("C Button individual colors")) {
                 if (ImGui::BeginTable("tableBTN_CSep", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-                ImGui::TableSetupColumn("Button C individual colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
+                    ImGui::TableSetupColumn("C-Buttons individual colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                     Table_InitHeader(false);
-                Draw_HelpIcon("Affect Button C Up colors, but not C cursor colors\nTo edit C Cursor check C Button color on top");
+                    Draw_HelpIcon("Affects C-Buttons Up colors, but not C cursor colors\nTo edit C Cursor check C-Buttons color on top");
                     SohImGui::EnhancementColor("C Buttons Up", "gCCCUBtnPrim", c_btn_u_colors, ImVec4(255,160,0,255));
                     Table_NextLine();
-                Draw_HelpIcon("Affect Button C Down colors, but not C cursor colors\nTo edit C Cursor check C Button color on top");
+                    Draw_HelpIcon("Affects C-Buttons Down colors, but not C cursor colors\nTo edit C Cursor check C-Buttons color on top");
                     SohImGui::EnhancementColor("C Buttons Down", "gCCCDBtnPrim", c_btn_d_colors, ImVec4(255,160,0,255));
                     Table_NextLine();
-                Draw_HelpIcon("Affect Button C Left colors, but not C cursor colors\nTo edit C Cursor check C Button color on top");
+                    Draw_HelpIcon("Affects C-Buttons Left colors, but not C cursor colors\nTo edit C Cursor check C-Buttons color on top");
                     SohImGui::EnhancementColor("C Buttons Left", "gCCCLBtnPrim", c_btn_l_colors, ImVec4(255,160,0,255));
                     Table_NextLine();
-                Draw_HelpIcon("Affect Button C Right colors, but not C cursor colors\nTo edit C Cursor check C Button color on top");
+                    Draw_HelpIcon("Affects C-Buttons Right colors, but not C cursor colors\nTo edit C Cursor check C-Buttons color on top");
                     SohImGui::EnhancementColor("C Buttons Right", "gCCCRBtnPrim", c_btn_r_colors, ImVec4(255,160,0,255));
                     ImGui::EndTable();
                 }
@@ -873,22 +879,25 @@ void Draw_HUDButtons(){
         }
         if (ImGui::CollapsingHeader("Start button colors")) {
             if (ImGui::BeginTable("tableBTN_Start", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-            ImGui::TableSetupColumn("Button Start colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
+                ImGui::TableSetupColumn("Start button colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader(false);
-            Draw_HelpIcon("Affect Button Start colors", false);
+                Draw_HelpIcon("Affects the Start button color", false);
-            SohImGui::EnhancementColor("Start Buttons", "gCCStartBtnPrim", start_btn_colors, ImVec4(120, 120, 120, 255), true, false, true);
+                SohImGui::EnhancementColor("Start Buttons", "gCCStartBtnPrim", start_btn_colors, ImVec4(200, 0, 0, 255), true, false, true);
                 ImGui::EndTable();
             }
         }
         if (CVar_GetS32("gDpadEquips",0) && ImGui::CollapsingHeader("DPad colors")) {
             if (ImGui::BeginTable("tableDpadHud", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-            ImGui::TableSetupColumn("DPad", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
+                ImGui::TableSetupColumn("DPad color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader(false);
-            Draw_HelpIcon("DPad background color, should be white for default value");
+                Draw_HelpIcon("DPad background color, White is the default value");
                 SohImGui::EnhancementColor("DPad background color", "gCCDpadPrim", dpad_colors, ImVec4(255, 255, 255, 255));
                 ImGui::EndTable();
             }
         }
+    } else {
+        ImGui::Text("To modify buttons colors you need \"Custom Colors\" scheme\nto be selected in \"General\" tab.\nOnce enabled you will be able to modify the following colors:\nA Button colors,\nB Button colors,\nC Button colors & cursor,\nStart button\nDPad icon");
+    }
 }
 void Draw_General(){
     if (ImGui::BeginTable("tableScheme", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV | ImGuiTableFlags_Hideable)) {
@@ -902,10 +911,11 @@ void Draw_General(){
         Draw_HelpIcon("Change interface color to GameCube style");
         SohImGui::EnhancementRadioButton("GCN Colors", "gHudColors", 1);
         Table_NextCol();
-        Draw_HelpIcon("Change interface color to your own made style");
+        Draw_HelpIcon("Lets you change every interface color to your liking");
         SohImGui::EnhancementRadioButton("Custom Colors", "gHudColors", 2);
         ImGui::EndTable();
     }
+    if (CVar_GetS32("gHudColors",0) ==2 ){
         if (ImGui::CollapsingHeader("Hearts colors")) {
             SohImGui::Tooltip("Hearts colors in general\nDD stand for Double Defense");
             if (ImGui::BeginTable("tableHearts", 3, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV | ImGuiTableFlags_Hideable)) {
@@ -913,13 +923,13 @@ void Draw_General(){
                 ImGui::TableSetupColumn("Hearts (DD)", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable, TablesCellsWidth/3);
                 ImGui::TableSetupColumn("Hearts Outline (DD)", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable, TablesCellsWidth/3);
                 Table_InitHeader();
-            Draw_HelpIcon("Affect Hearts inner color when you do not have Double Defense", false);
+                Draw_HelpIcon("Affects the inner color", false);
                 SohImGui::EnhancementColor("Inner normal", "gCCHeartsPrim", hearts_colors, ImVec4(255,70,50,255), true, false, true);
                 Table_NextCol();
-            Draw_HelpIcon("Affect Hearts inner color when you have Double Defense", false);
+                Draw_HelpIcon("Affects the inner color", false);
                 SohImGui::EnhancementColor("Inner DD", "gCCDDHeartsPrim", hearts_ddi_colors, ImVec4(255,70,50,255), true, false, true);
                 Table_NextCol();
-            Draw_HelpIcon("Affect Hearts Outline color when you have Double Defense\nWhite by default", false);
+                Draw_HelpIcon("Affects the outline color of hearts when you have Double Defense\nWhite is the default value", false);
                 SohImGui::EnhancementColor("Outline DD", "gDDCCHeartsPrim", hearts_dd_colors, ImVec4(255,255,255,255), true, false, true);
                 ImGui::EndTable();
             }
@@ -929,34 +939,34 @@ void Draw_General(){
                 ImGui::TableSetupColumn("Magic meter", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
                 ImGui::TableSetupColumn("Magic meter in use", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
                 Table_InitHeader();
-            Draw_HelpIcon("Affect the border of the magic meter\nWhite in original game, color change only when used one time");
+                Draw_HelpIcon("Affects the border of the magic meter\nWhite is the default value, color change only when used one time");
                 SohImGui::EnhancementColor("Borders", "gCCMagicBorderNormPrim", magic_bordern_colors, ImVec4(255,255,255,255), false);
                 Table_NextCol();
-            Draw_HelpIcon("Affect the border of the magic meter when being used\nWhite flash in original game");
+                Draw_HelpIcon("Affects the border of the magic meter when being used\nWhite is the default value");
                 SohImGui::EnhancementColor("Borders in use", "gCCMagicBorderPrim", magic_border_colors, ImVec4(255,255,255,255), false);
                 Table_NextLine();
-            Draw_HelpIcon("Affect the magic meter color\nGreen in original game");
+                Draw_HelpIcon("Affects the magic meter color\nGreen is the default value");
                 SohImGui::EnhancementColor("Main color", "gCCMagicPrim", magic_remaining_colors, ImVec4(0,200,0,255));
                 Table_NextCol();
-            Draw_HelpIcon("Affect the magic meter when being used\nYellow in original game");
+                Draw_HelpIcon("Affects the magic meter when being used\nYellow is the default value");
                 SohImGui::EnhancementColor("Main color in use", "gCCMagicUsePrim", magic_use_colors, ImVec4(250,250,0,255));
                 ImGui::EndTable();
             }
         }
-    if (ImGui::CollapsingHeader("Minimap & compass colors")) {
+        if (ImGui::CollapsingHeader("Minimap and compass colors")) {
             if (ImGui::BeginTable("tableMinimapCol", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-            ImGui::TableSetupColumn("Minimap colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
+                ImGui::TableSetupColumn("Minimap color", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader();
-            Draw_HelpIcon("Affect the Overworld minimaps.");
+                Draw_HelpIcon("Affects the Overworld minimaps");
                 SohImGui::EnhancementColor("Overworlds", "gCCMinimapPrim", minimap_colors, ImVec4(0, 255, 255, 255));
                 Table_NextLine();
-            Draw_HelpIcon("Affect the Dungeon minimaps.");
+                Draw_HelpIcon("Affects the Dungeon minimaps");
                 SohImGui::EnhancementColor("Dungeons", "gCCMinimapDGNPrim", dgn_minimap_colors, ImVec4(100, 255, 255, 255));
                 Table_NextLine();
-            Draw_HelpIcon("Affect the current position arrow on the minimap (yellow).");
+                Draw_HelpIcon("Affects the current position arrow on the minimap\nYellow is the default value");
                 SohImGui::EnhancementColor("Current position arrow", "gCCMinimapCPPrim", cp_minimap_colors, ImVec4(200, 255, 0, 255));
                 Table_NextLine();
-            Draw_HelpIcon("Affect the last entrance position arrow on the minimap (red).");
+                Draw_HelpIcon("Affects the last entrance position arrow on the minimap\nRed is the default value");
                 SohImGui::EnhancementColor("Last entrance arrow", "gCCMinimapLEPrim", le_minimap_colors, ImVec4(200, 0, 0, 255));
                 ImGui::EndTable();
             }
@@ -966,10 +976,10 @@ void Draw_General(){
                 ImGui::TableSetupColumn("Title cards Overworld", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
                 ImGui::TableSetupColumn("Title cards Bosses", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth/2);
                 Table_InitHeader();
-            Draw_HelpIcon("Affect all the overworld title cards color, white by default.");
+                Draw_HelpIcon("Affects all the overworld title cards color, white is the default value");
                 SohImGui::EnhancementColor("Main color", "gCCTC_OW_U_Prim", tc_ou_colors, ImVec4(255, 255, 255, 255), false);
                 Table_NextCol();
-            Draw_HelpIcon("Affect all the bosses title cards color, white by default.");
+                Draw_HelpIcon("Affects all the bosses title cards color, white is the default value");
                 SohImGui::EnhancementColor("Main color", "gCCTC_B_U_Prim", tc_bu_colors, ImVec4(255, 255, 255, 255), false);
                 ImGui::EndTable();
             }
@@ -978,17 +988,20 @@ void Draw_General(){
             if (ImGui::BeginTable("tableMiscHudCol", 1, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV | ImGuiTableFlags_Hideable)) {
                 ImGui::TableSetupColumn("Misc HUD colors", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_NoSort, TablesCellsWidth);
                 Table_InitHeader();
-            Draw_HelpIcon("Affect the Rupee icon on interface\nGreen by default.");
+                Draw_HelpIcon("Affects the Rupee icon on interface\nGreen is the default value");
                 SohImGui::EnhancementColor("Rupee icon", "gCCRupeePrim", rupee_colors, ImVec4(200, 255, 100, 255));
                 Table_NextLine();
-            Draw_HelpIcon("Affect the Small keys icon on interface\nGray by default.");
+                Draw_HelpIcon("Affects the Small keys icon on interface\nGray is the default value");
                 SohImGui::EnhancementColor("Small Keys icon", "gCCKeysPrim", smolekey_colors, ImVec4(200, 230, 255, 255));
                 Table_NextLine();
-            Draw_HelpIcon("Affect the Stone of Agony icon on interface\nWhite by default.");
+                Draw_HelpIcon("Affects the Stone of Agony icon on interface\nWhite is the default value");
                 SohImGui::EnhancementColor("Stone of agony icon", "gCCVSOAPrim", visualagony_colors, ImVec4(255, 255, 255, 255));
                 ImGui::EndTable();
             }
         }
+    } else {
+        ImGui::Text("To modify some generic colors you need \"Custom Colors\" scheme\nto be selected in \"General\" tab.\nOnce enabled you will be able to modify the following colors :\nHearts,\nMagic Meter,\nMinimap & compass,\nTitle card\nKeys & Rupee icons\nStone of Agony (Visual)");
+    }
 }
 void DrawCosmeticsEditor(bool& open) {
     if (!open) {
@@ -1014,7 +1027,7 @@ void DrawCosmeticsEditor(bool& open) {
             Draw_ItemsSkills();
             ImGui::EndTabItem();
         }
-        if (ImGui::BeginTabItem("Npcs")) {
+        if (ImGui::BeginTabItem("NPCs")) {
             Draw_Npcs();
             ImGui::EndTabItem();
         }

soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c

@@ -1759,8 +1759,8 @@ void FileChoose_Main(GameState* thisx) {
                           PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
 
         if (CVar_GetS32("gHudColors", 1) == 2) {
-            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetS32("gCCFileChooseTextPrimR", 0),
+            gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetS32("gCCFileChooseTextPrimR", 100),
-                            CVar_GetS32("gCCFileChooseTextPrimG", 100), CVar_GetS32("gCCFileChooseTextPrimB", 255),
+                            CVar_GetS32("gCCFileChooseTextPrimG", 255), CVar_GetS32("gCCFileChooseTextPrimB", 255),
                             this->controlsAlpha);
         } else {
             gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 100, 255, 255, this->controlsAlpha);