From 9cf1061d592dd4bc5e2e8ab0920b80d3934e1e2b Mon Sep 17 00:00:00 2001
From: SonicDarkYT <99994913+SonicDarkYT@users.noreply.github.com>
Date: Sat, 26 Feb 2022 21:49:24 -0300
Subject: [PATCH] More Color Palettes (#137)

* Update pc_main.c

* Update mario_misc.c

* Update djui_panel_player.c
---
 src/game/mario_misc.c           | 12 ++++++++++--
 src/pc/djui/djui_panel_player.c | 14 +++++++++++---
 src/pc/pc_main.c                |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/game/mario_misc.c b/src/game/mario_misc.c
index ba71e4dc..00010ceb 100644
--- a/src/game/mario_misc.c
+++ b/src/game/mario_misc.c
@@ -94,9 +94,14 @@ struct PlayerColor gPlayerColors[] = {
     DEFINE_PLAYER_COLOR(0x6d, 0x3c, 0x9a, /**/ 0x2c, 0x26, 0x3f),
     // fake wario
     DEFINE_PLAYER_COLOR(0xf9, 0xeb, 0x30, /**/ 0x7f, 0x20, 0x7a),
-
+    
+    DEFINE_PLAYER_COLOR(0x7b, 0x00, 0xde, /**/ 0xff, 0x00, 0x00),
+    DEFINE_PLAYER_COLOR(0x95, 0x43, 0x01, /**/ 0xc6, 0xb1, 0x32),
+    DEFINE_PLAYER_COLOR(0x4c, 0x5f, 0x20, /**/ 0x07, 0x09, 0x07),
     DEFINE_PLAYER_COLOR(0x00, 0x2f, 0xc8, /**/ 0xbf, 0xde, 0xff),
+    DEFINE_PLAYER_COLOR(0x11, 0x11, 0x11, /**/ 0xf8, 0x3b, 0x05),
     DEFINE_PLAYER_COLOR(0xc1, 0x2c, 0x72, /**/ 0x34, 0x16, 0x0d),
+    DEFINE_PLAYER_COLOR(0xff, 0x96, 0xc8, /**/ 0xff, 0x00, 0x00),
     DEFINE_PLAYER_COLOR(0x4c, 0xff, 0x4c, /**/ 0x81, 0x00, 0x00),
     DEFINE_PLAYER_COLOR(0xa9, 0x78, 0xfc, /**/ 0x61, 0x3d, 0x2e),
 
@@ -109,6 +114,9 @@ struct PlayerColor gPlayerColors[] = {
     DEFINE_PLAYER_COLOR(0xff, 0x8a, 0x00, /**/ 0x00, 0x51, 0x10),
     DEFINE_PLAYER_COLOR(0x65, 0xfa, 0xff, /**/ 0x4c, 0x1e, 0x3f),
     DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0xb2, 0x28, 0x18),
+    DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0x00, 0x98, 0x00),
+    DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0x6d, 0x3c, 0x9a),
+    DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0xf9, 0xeb, 0x30),
 };
 
 const size_t gNumPlayerColors = sizeof(gPlayerColors) / sizeof(*gPlayerColors);
@@ -853,4 +861,4 @@ Gfx* geo_mario_cap_display_list(s32 callContext, struct GraphNode* node, UNUSED
     struct GraphNodeGenerated* asGenerated = (struct GraphNodeGenerated*)node;
     asGenerated->fnNode.node.flags = (asGenerated->fnNode.node.flags & 0xFF) | (character->capEnemyLayer << 8);
     return gfx;
-}
\ No newline at end of file
+}
diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c
index d0a22f8e..fa968c3e 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -91,13 +91,18 @@ void djui_panel_player_create(struct DjuiBase* caller) {
         djui_base_set_size(&selectionbox1->base, 1.0f, 32);
         djui_interactable_hook_value_change(&selectionbox1->base, djui_panel_player_value_changed);
 
-        char* paletteChoices[16] = {
+        char* paletteChoices[24] = {
             "Mario",
             "Luigi",
             "Waluigi",
             "Wario",
+            "Chuckya",
+            "Goomba",
+            "Clover",
             "Cobalt",
+            "Fury",
             "Hot Pink",
+            "Nice Pink",
             "Seafoam",
             "Lilac",
             "Copper",
@@ -107,9 +112,12 @@ void djui_panel_player_create(struct DjuiBase* caller) {
             "Eggplant",
             "Orange",
             "Arctic",
-            "Fire",
+            "Fire Mario",
+            "Fire Luigi",
+            "Fire Waluigi",
+            "Fire Wario",
         };
-        struct DjuiSelectionbox* selectionbox2 = djui_selectionbox_create(&body->base, "Palette", paletteChoices, 16, &configPlayerPalette);
+        struct DjuiSelectionbox* selectionbox2 = djui_selectionbox_create(&body->base, "Palette", paletteChoices, 24, &configPlayerPalette);
         djui_base_set_size_type(&selectionbox2->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
         djui_base_set_size(&selectionbox2->base, 1.0f, 32);
         djui_interactable_hook_value_change(&selectionbox2->base, djui_panel_player_value_changed);
diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c
index e5fc9fed..6d99e184 100644
--- a/src/pc/pc_main.c
+++ b/src/pc/pc_main.c
@@ -224,7 +224,7 @@ void main_func(void) {
     mod_list_init();
     configfile_load(configfile_name());
     if (configPlayerModel >= CT_MAX) { configPlayerModel = 0; }
-    if (configPlayerPalette >= 16) { configPlayerPalette = 0; }
+    if (configPlayerPalette >= 24) { configPlayerPalette = 0; }
 
     if (gCLIOpts.FullScreen == 1)
         configWindow.fullscreen = true;