Fixed errors in color replacement

aquova · Feb 26, 2018 · 14dd3ab · 14dd3ab
1 parent dfd8023
commit 14dd3ab
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git a/KNDL-Randomize.py b/KNDL-Randomize.py
@@ -19,13 +19,13 @@
 
 # ROM locations of Kirby's palette
 palette_locations = ["DC62A", "DC8AA", "DC96C", "DCB2A", "DCBAA", "DD0C4", "DD0E6", "DD23A", "DD306",
-                     "E7418", "E745C", "E74A0", "E9D5C", "39D7E", "393D2", "39F9E", "F997C", "F997C",
+                     "E7418", "E745C", "E74A0", "E9D5C", "E9D7E", "E9ED2", "E9F9E", "F997C", "F997C",
                      "F99C0", "F9A04", "FEFFC", "FF01E", "FF172", "FF23E", "108364", "1083A8", "1083EC",
                      "10C260", "10C282", "10C3D6", "10C4A2", "123604", "123648", "12368C", "12A6DC",
                      "12A6FE", "12A852", "12A91E", "137F80", "137FC4", "138008", "13BF44", "13BF66",
                      "13C0BA", "13C186", "149734", "149778", "14D078", "14D09A", "14D1EE", "14D2BA",
-                     "150320", "150364", "1503A8", "151734", "151806", "15197C", "151A48", "153810",
-                     "153854", "153898", "1543E0", "154402", "154600", "15ECE0", "15ED24", "153D68",
+                     "150320", "150364", "1503A8", "1517E4", "151806", "15197C", "151A48", "153810",
+                     "153854", "153898", "1543E0", "154402", "154600", "15ECE0", "15ED24", "15ED68",
                      "162678", "16269A", "166CE4", "166D06", "166F04", "16FCF0", "16FD34", "16FD78",
                      "172448", "17246A", "1751A0", "1751C2", "175316", "1753E2", "17C3E4", "17C428",
                      "1801E4", "180206", "18035A", "180426", "183F34", "183F78", "183FBC", "1845E8",
@@ -39,19 +39,19 @@
                      "2476E4", "24A9FC", "53F4E6", "596D22", "599922", "5BA46E", "5BD09A", "5BF426",
                      "5C220E", "5C4AAA", "5C7452", "5C9B22", "5CCC90", "5CCCD2", "5E2C22", "609D42", "7DB192"]
 
-new_palette = ["2104F953F01BCF136D07880606068305FC055A05120594361853DE6FFF7F", # Green
-               "2104FF077F07FF06DD061606B1054C059F047C04360494361853DE6FFF7F", # Yellow
-               "2104BF563F203C18571053084E082A043F543C38371894361853DE6FFF7F", # Red
-               "2104FF7FFF7F9C731863734EEF3D6B2D5F35BB24371894361853DE6FFF7F", # Snow
-               "21043146EF3DAD356B2D29250821C6189F0A1F067A0594361853DE6FFF7F", # Carbon
-               "2104F57F927F0E7F8B7E067EA365E6408D7D2A71875C94361853DE6FFF7F", # Ocean
-               "2104577F907A2D72EB69615D0151A1402B60294C283894361853DE6FFF7F", # Sapphire
-               "21041A7F977EF57D727D4F6CCD05AA383745B338302C94361853DE6FFF7F", # Grape
-               "2104F873EF63684FA13A2136C12D6121BF2A1C16980594361853DE6FFF7F", # Emerald
-               "2104DF07FF129F121F169F193911D10C5F05F904910494361853DE6FFF7F", # Orange
-               "21049B4A3B36D82D7425111DCE148B10B41071082F0494361853DE6FFF7F", # Chocolate
-               "21047F7F7F721F66BF55FC3C74206D0CA432272EC62194361853DE6FFF7F", # Cherry
-               "2104FF7F9C7318639452EF3D6B2DE71C10428C31292594361853DE6FFF7F"] # Chalk
+new_palette = ["2104F953F01BCF136D07880606068305FC055A051205", # Green
+               "2104FF077F07FF06DD061606B1054C059F047C043604", # Yellow
+               "2104BF563F203C18571053084E082A043F543C383718", # Red
+               "2104FF7FFF7F9C731863734EEF3D6B2D5F35BB243718", # Snow
+               "21043146EF3DAD356B2D29250821C6189F0A1F067A05", # Carbon
+               "2104F57F927F0E7F8B7E067EA365E6408D7D2A71875C", # Ocean
+               "2104577F907A2D72EB69615D0151A1402B60294C2838", # Sapphire
+               "21041A7F977EF57D727D4F6CCD05AA383745B338302C", # Grape
+               "2104F873EF63684FA13A2136C12D6121BF2A1C169805", # Emerald
+               "2104DF07FF129F121F169F193911D10C5F05F9049104", # Orange
+               "21049B4A3B36D82D7425111DCE148B10B41071082F04", # Chocolate
+               "21047F7F7F721F66BF55FC3C74206D0CA432272EC621", # Cherry
+               "2104FF7F9C7318639452EF3D6B2DE71C10428C312925"] # Chalk
 
 # Creating a custom exception, how fancy
 class HashError(Exception):

diff --git a/KNDL-Simple.py b/KNDL-Simple.py
@@ -18,13 +18,13 @@
 
 # ROM locations of Kirby's palette
 palette_locations = ["DC62A", "DC8AA", "DC96C", "DCB2A", "DCBAA", "DD0C4", "DD0E6", "DD23A", "DD306",
-                     "E7418", "E745C", "E74A0", "E9D5C", "39D7E", "393D2", "39F9E", "F997C", "F997C",
+                     "E7418", "E745C", "E74A0", "E9D5C", "E9D7E", "E9ED2", "E9F9E", "F997C", "F997C",
                      "F99C0", "F9A04", "FEFFC", "FF01E", "FF172", "FF23E", "108364", "1083A8", "1083EC",
                      "10C260", "10C282", "10C3D6", "10C4A2", "123604", "123648", "12368C", "12A6DC",
                      "12A6FE", "12A852", "12A91E", "137F80", "137FC4", "138008", "13BF44", "13BF66",
                      "13C0BA", "13C186", "149734", "149778", "14D078", "14D09A", "14D1EE", "14D2BA",
-                     "150320", "150364", "1503A8", "151734", "151806", "15197C", "151A48", "153810",
-                     "153854", "153898", "1543E0", "154402", "154600", "15ECE0", "15ED24", "153D68",
+                     "150320", "150364", "1503A8", "1517E4", "151806", "15197C", "151A48", "153810",
+                     "153854", "153898", "1543E0", "154402", "154600", "15ECE0", "15ED24", "15ED68",
                      "162678", "16269A", "166CE4", "166D06", "166F04", "16FCF0", "16FD34", "16FD78",
                      "172448", "17246A", "1751A0", "1751C2", "175316", "1753E2", "17C3E4", "17C428",
                      "1801E4", "180206", "18035A", "180426", "183F34", "183F78", "183FBC", "1845E8",
@@ -38,20 +38,20 @@
                      "2476E4", "24A9FC", "53F4E6", "596D22", "599922", "5BA46E", "5BD09A", "5BF426",
                      "5C220E", "5C4AAA", "5C7452", "5C9B22", "5CCC90", "5CCCD2", "5E2C22", "609D42", "7DB192"]
 
-new_palette = ["00005F7B9F6E5F62DE513B39961C4C087F401A2816145C4B9D5BDF6FFF7F", # Default
-               "2104F953F01BCF136D07880606068305FC055A05120594361853DE6FFF7F", # Green
-               "2104FF077F07FF06DD061606B1054C059F047C04360494361853DE6FFF7F", # Yellow
-               "2104BF563F203C18571053084E082A043F543C38371894361853DE6FFF7F", # Red
-               "2104FF7FFF7F9C731863734EEF3D6B2D5F35BB24371894361853DE6FFF7F", # Snow
-               "21043146EF3DAD356B2D29250821C6189F0A1F067A0594361853DE6FFF7F", # Carbon
-               "2104F57F927F0E7F8B7E067EA365E6408D7D2A71875C94361853DE6FFF7F", # Ocean
-               "2104577F907A2D72EB69615D0151A1402B60294C283894361853DE6FFF7F", # Sapphire
-               "21041A7F977EF57D727D4F6CCD05AA383745B338302C94361853DE6FFF7F", # Grape
-               "2104F873EF63684FA13A2136C12D6121BF2A1C16980594361853DE6FFF7F", # Emerald
-               "2104DF07FF129F121F169F193911D10C5F05F904910494361853DE6FFF7F", # Orange
-               "21049B4A3B36D82D7425111DCE148B10B41071082F0494361853DE6FFF7F", # Chocolate
-               "21047F7F7F721F66BF55FC3C74206D0CA432272EC62194361853DE6FFF7F", # Cherry
-               "2104FF7F9C7318639452EF3D6B2DE71C10428C31292594361853DE6FFF7F"] # Chalk
+new_palette = ["00005F7B9F6E5F62DE513B39961C4C087F401A281614", # Default
+               "2104F953F01BCF136D07880606068305FC055A051205", # Green
+               "2104FF077F07FF06DD061606B1054C059F047C043604", # Yellow
+               "2104BF563F203C18571053084E082A043F543C383718", # Red
+               "2104FF7FFF7F9C731863734EEF3D6B2D5F35BB243718", # Snow
+               "21043146EF3DAD356B2D29250821C6189F0A1F067A05", # Carbon
+               "2104F57F927F0E7F8B7E067EA365E6408D7D2A71875C", # Ocean
+               "2104577F907A2D72EB69615D0151A1402B60294C2838", # Sapphire
+               "21041A7F977EF57D727D4F6CCD05AA383745B338302C", # Grape
+               "2104F873EF63684FA13A2136C12D6121BF2A1C169805", # Emerald
+               "2104DF07FF129F121F169F193911D10C5F05F9049104", # Orange
+               "21049B4A3B36D82D7425111DCE148B10B41071082F04", # Chocolate
+               "21047F7F7F721F66BF55FC3C74206D0CA432272EC621", # Cherry
+               "2104FF7F9C7318639452EF3D6B2DE71C10428C312925"] # Chalk
 
 class HashError(Exception):
     pass

diff --git a/docs/aquova_kndl_notes.txt b/docs/aquova_kndl_notes.txt
@@ -116,6 +116,10 @@ Chocolate - 21049B4A3B36D82D7425111DCE148B10B41071082F0494361853DE6FFF7F
 Cherry - 21047F7F7F721F66BF55FC3C74206D0CA432272EC62194361853DE6FFF7F
 Chalk - 2104FF7F9C7318639452EF3D6B2DE71C10428C31292594361853DE6FFF7F
 
+The last 4 colors have to do with ability accessories, i.e. for neutral Kirby it's 4 white colors, but they change for Throw Kirby's headband. Probably should leave those intact.
+
+Throw Kirby's palette - 00009F779F6E5F62DE513B39961C4C087F401A281614
+
 Locations in ROM of Kirby's palette (all 163 of them...)
 DC62A, DC8AA, DC96C, DCB2A, DCBAA, DD0C4, DD0E6, DD23A, DD306, E7418, E745C, E74A0, E9D5C, 39D7E, 393D2, 39F9E, F997C, F997C, F99C0, F9A04, FEFFC, FF01E, FF172, FF23E, 108364, 1083A8, 1083EC, 10C260, 10C282, 10C3D6, 10C4A2, 123604, 123648, 12368C, 12A6DC, 12A6FE, 12A852, 12A91E, 137F80, 137FC4, 138008, 13BF44, 13BF66, 13C0BA, 13C186, 149734, 149778, 14D078, 14D09A, 14D1EE, 14D2BA, 150320, 150364, 1503A8, 151734, 151806, 15197C, 151A48, 153810, 153854, 153898, 1543E0, 154402, 154600, 15ECE0, 15ED24, 153D68, 162678, 16269A, 166CE4, 166D06, 166F04, 16FCF0, 16FD34, 16FD78, 172448, 17246A, 1751A0, 1751C2, 175316, 1753E2, 17C3E4, 17C428, 1801E4, 180206, 18035A, 180426, 183F34, 183F78, 183FBC, 1845E8, 18460A, 18464E, 186C7C, 186C9E, 189714, 189736, 196E48, 196E6A, 1A1890, 1A394C, 1A7818, 1A8830, 1A9D94, 1AB300, 1AC5CC, 1AD30C, 1AE878, 1AF444, 1B19EC, 1B3E14, 1B66FC, 1B6E34, 1BC074, 1BE6BE, 1BE8C0, 1BEFF8, 1C051C, 1C7260, 1C9890, 1CC7EC, 1CC82E, 1CF814, 1D4348, 1D60B8, 1D9F20, 1E1F28, 1E1F6A, 1F0074, 1F0096, 1F1F4C, 1F5A34, 1FA7E0, 1FB9D8, 1FDF58, 1FDF9A, 201374, 203BF4, 20D1E4, 218CD4, 21C3D0, 21DEF0, 23F834, 23F988, 23FA54, 23FA98, 2476A0, 2476E4, 24A9FC, 53F4E6, 596D22, 599922, 5BA46E, 5BD09A, 5BF426, 5C220E, 5C4AAA, 5C7452, 5C9B22, 5CCC90, 5CCCD2, 5E2C22, 609D42, 7DB192