From 0c6943fc6a8e205b9f1b630b8c9c0a9e5ca6e477 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Sat, 24 Oct 2020 02:46:18 +0200
Subject: [PATCH] palette fixes

---
 EntranceRandomizer.py |  3 ++-
 playerSettings.yaml   | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py
index 042d54bc..595d6319 100755
--- a/EntranceRandomizer.py
+++ b/EntranceRandomizer.py
@@ -373,7 +373,8 @@ def parse_arguments(argv, no_defaults=False):
                          'heartbeep', "skip_progression_balancing", "triforce_pieces_available",
                          "triforce_pieces_required", "shop_shuffle",
                          'remote_items', 'progressive', 'dungeon_counters', 'glitch_boots', 'killable_thieves',
-                         'tile_shuffle', 'bush_shuffle', 'shuffle_prizes', 'sprite_pool', 'dark_room_logic', 'restrict_dungeon_item_on_boss']:
+                         'tile_shuffle', 'bush_shuffle', 'shuffle_prizes', 'sprite_pool', 'dark_room_logic', 'restrict_dungeon_item_on_boss',
+                         'hud_palettes', 'sword_palettes', 'shield_palettes', 'link_palettes']:
                 value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
                 if player == 1:
                     setattr(ret, name, {1: value})
diff --git a/playerSettings.yaml b/playerSettings.yaml
index b6caabf9..04aed0b0 100644
--- a/playerSettings.yaml
+++ b/playerSettings.yaml
@@ -367,8 +367,8 @@ rom:
     off: 0
   ow_palettes: # Change the colors of the overworld
     default: 50 # No changes
-    random: 0 # Shuffle the colors
-    blackout: 0 # Never use this
+    random: 0 # Shuffle the colors, with harmony in mind
+    blackout: 0 # everything black / blind mode
     grayscale: 0
     negative: 0
     classic: 0
@@ -377,8 +377,8 @@ rom:
     puke: 0
   uw_palettes: # Change the colors of caves and dungeons
     default: 50 # No changes
-    random: 0 # Shuffle the colors
-    blackout: 0 # Never use this
+    random: 0 # Shuffle the colors, with harmony in mind
+    blackout: 0 # everything black / blind mode
     grayscale: 0
     negative: 0
     classic: 0
@@ -387,8 +387,8 @@ rom:
     puke: 0
   hud_palettes: # Change the colors of the hud
     default: 50 # No changes
-    random: 0 # Shuffle the colors
-    blackout: 0 # Never use this
+    random: 0 # Shuffle the colors, with harmony in mind
+    blackout: 0 # everything black / blind mode
     grayscale: 0
     negative: 0
     classic: 0
@@ -397,18 +397,18 @@ rom:
     puke: 0
   sword_palettes: # Change the colors of swords
     default: 50 # No changes
-    random: 0 # Shuffle the colors
-    blackout: 0 # Never use this
+    random: 0 # Shuffle the colors, with harmony in mind
+    blackout: 0 # everything black / blind mode
     grayscale: 0
     negative: 0
     classic: 0
     dizzy: 0
     sick: 0
     puke: 0
-  uw_palettes: # Change the colors of shields
+  shield_palettes: # Change the colors of shields
     default: 50 # No changes
-    random: 0 # Shuffle the colors
-    blackout: 0 # Never use this
+    random: 0 # Shuffle the colors, with harmony in mind
+    blackout: 0 # everything black / blind mode
     grayscale: 0
     negative: 0
     classic: 0