Merge pull request #437 from PurpleHato/FixNaviColor

FIX: Default Navi's colors have been altered recent merged PRs

2 files changed, 11 insertions, 11 deletions

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 0e1482b7b..67bb3d218 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -1089,22 +1089,22 @@ namespace 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.");
                         EnhancementColor("Navi Idle Inner", "gNavi_Idle_Inner_", navi_idle_i_col, ImVec4(255,255,255,255), false);
                         Tooltip("Inner color for Navi (idle flying around)");
-                        EnhancementColor("Navi Idle Outer", "gNavi_Idle_Outer_", navi_idle_o_col, ImVec4(115,230,255,255), false);
+                        EnhancementColor("Navi Idle Outer", "gNavi_Idle_Outer_", navi_idle_o_col, ImVec4(0,0,255,255), false);
                         Tooltip("Outer color for Navi (idle flying around)");
                         ImGui::Separator();
-                        EnhancementColor("Navi NPC Inner", "gNavi_NPC_Inner_", navi_npc_i_col, ImVec4(100,100,255,255), false);
+                        EnhancementColor("Navi NPC Inner", "gNavi_NPC_Inner_", navi_npc_i_col, ImVec4(150,150,255,255), false);
                         Tooltip("Inner color for Navi (when Navi fly around NPCs)");
-                        EnhancementColor("Navi NPC Outer", "gNavi_NPC_Outer_", navi_npc_o_col, ImVec4(90,90,255,255), false);
+                        EnhancementColor("Navi NPC Outer", "gNavi_NPC_Outer_", navi_npc_o_col, ImVec4(150,150,255,255), false);
                         Tooltip("Outer color for Navi (when Navi fly around NPCs)");
                         ImGui::Separator();
                         EnhancementColor("Navi Enemy Inner", "gNavi_Enemy_Inner_", navi_enemy_i_col, ImVec4(255,255,0,255), false);
                         Tooltip("Inner color for Navi (when Navi fly around Enemies or Bosses)");
-                        EnhancementColor("Navi Enemy Outer", "gNavi_Enemy_Outer_", navi_enemy_o_col, ImVec4(220,220,0,255), false);
+                        EnhancementColor("Navi Enemy Outer", "gNavi_Enemy_Outer_", navi_enemy_o_col, ImVec4(220,155,0,255), false);
                         Tooltip("Outer color for Navi (when Navi fly around Enemies or Bosses)");
                         ImGui::Separator();
                         EnhancementColor("Navi Prop Inner", "gNavi_Prop_Inner_", navi_prop_i_col, ImVec4(0,255,0,255), false);
                         Tooltip("Inner color for Navi (when Navi fly around props (signs etc))");
-                        EnhancementColor("Navi Prop Outer", "gNavi_Prop_Outer_", navi_prop_o_col, ImVec4(0,220,0,255), false);
+                        EnhancementColor("Navi Prop Outer", "gNavi_Prop_Outer_", navi_prop_o_col, ImVec4(0,255,0,255), false);
                         Tooltip("Outer color for Navi (when Navi fly around props (signs etc))");
                         ImGui::EndTabItem();
                     }
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index bdb2fe78c..702ab622a 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -339,19 +339,19 @@ void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, Gl
     if (CVar_GetS32("gUseNaviCol",0) != 1 ) {
         if (actorCategory == ACTORCAT_PLAYER) {
             naviColor->inner.r = 255; naviColor->inner.g = 255; naviColor->inner.b = 255;
-            naviColor->outer.r = 115; naviColor->outer.g = 230; naviColor->outer.b = 255;
+            naviColor->outer.r = 0; naviColor->outer.g = 0; naviColor->outer.b = 255;
         }
         if (actorCategory == ACTORCAT_NPC) {
-            naviColor->inner.r = 100; naviColor->inner.g = 100; naviColor->inner.b = 255;
-            naviColor->outer.r = 90; naviColor->outer.g = 90; naviColor->outer.b = 255;
+            naviColor->inner.r = 150; naviColor->inner.g = 150; naviColor->inner.b = 255;
+            naviColor->outer.r = 150; naviColor->outer.g = 150; naviColor->outer.b = 255;
         }
         if (actorCategory == ACTORCAT_BOSS || actorCategory == ACTORCAT_ENEMY) {
             naviColor->inner.r = 255; naviColor->inner.g = 255; naviColor->inner.b = 0;
-            naviColor->outer.r = 220; naviColor->outer.g = 220; naviColor->outer.b = 0;
+            naviColor->outer.r = 220; naviColor->outer.g = 155; naviColor->outer.b = 0;
         }
         if (actorCategory == ACTORCAT_PROP) {
-            naviColor->inner.r = 0; naviColor->inner.g = 255; naviColor->inner.b = 90;
-            naviColor->outer.r = 0; naviColor->outer.g = 220; naviColor->outer.b = 0;
+            naviColor->inner.r = 0; naviColor->inner.g = 255; naviColor->inner.b = 0;
+            naviColor->outer.r = 0; naviColor->outer.g = 255; naviColor->outer.b = 0;
         }
     } else {
         if (actorCategory == ACTORCAT_PLAYER) {