blueberry, lemon, kiwi

Silvris · Dec 1, 2024 · 853bbd7 · 853bbd7
1 parent b12ffab
commit 853bbd7
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 3 deletions.
diff --git a/worlds/k64/aesthetics.py b/worlds/k64/aesthetics.py
@@ -7,6 +7,66 @@
     from .rom import K64ProcedurePatch
 
 kirby_flavor_presets = {
+    3: {
+        "0": "FFB5B5",
+        "1": "000800",
+        "2": "FF7384",
+        "3": "213A84",
+        "4": "F7F7F7",
+        "5": "94B5FF",
+        "6": "EF6B7B",
+        "7": "00085A",
+        "8": "7B94DE",
+        "9": "294A94",
+        "10": "D6D6D6",
+        "11": "312129",
+        "12": "8C949C",
+        "13": "0000D6",
+        "14": "6384CE",
+        "15": "4A6BCE",
+        "16": "D9CDFF",
+        "17": "3333B3"
+    },
+    4: {
+        "0": "FFB5B5",
+        "1": "000800",
+        "2": "FF734A",
+        "3": "0945A0",
+        "4": "F7F7F7",
+        "5": "FFD673",
+        "6": "FF6342",
+        "7": "00085A",
+        "8": "F7AD4A",
+        "9": "423173",
+        "10": "D6D6D6",
+        "11": "312129",
+        "12": "8C949C",
+        "13": "0000D6",
+        "14": "BD7321",
+        "15": "DE9C31",
+        "16": "FFF4C2",
+        "17": "FF8000"
+    },
+    5: {
+        "0": "FFB5B5",
+        "1": "000800",
+        "2": "FF8473",
+        "3": "3A6321",
+        "4": "F7F7F7",
+        "5": "94D66B",
+        "6": "EF7B5A",
+        "7": "00085A",
+        "8": "84C55A",
+        "9": "423173",
+        "10": "D6D6D6",
+        "11": "312129",
+        "12": "8C949C",
+        "13": "0000D6",
+        "14": "63A53A",
+        "15": "5A8C42",
+        "16": "B6FCBE",
+        "17": "665C33"
+    },
     13: {
          "1": "000008",
          "2": "5A4AF6",
@@ -209,6 +269,7 @@ def rgb888_to_rgba5551(red, green, blue) -> bytes:
     return struct.pack(">H", outcol)
 
 
+
 def get_palette_bytes(palette, target):
     output_data = bytearray()
     for color in target:

diff --git a/worlds/k64/options.py b/worlds/k64/options.py
@@ -109,9 +109,9 @@ class KirbyFlavorPreset(Choice):
     option_default = 0
     #option_bubblegum = 1
     #option_cherry = 2
-    #option_blueberry = 3
-    #option_lemon = 4
-    #option_kiwi = 5
+    option_blueberry = 3
+    option_lemon = 4
+    option_kiwi = 5
     #option_grape = 6
     #option_chocolate = 7
     #option_marshmallow = 8