From 4123cf50f9dbf222be76323bbb1520bd4d956353 Mon Sep 17 00:00:00 2001
From: binarylol <100501943+binarylol@users.noreply.github.com>
Date: Sun, 13 Mar 2022 22:19:39 -0400
Subject: [PATCH] Add 5 New Palettes (#31)

---
 src/game/characters.h           | 2 +-
 src/game/mario_misc.c           | 7 +++++++
 src/pc/djui/djui_panel_player.c | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/game/characters.h b/src/game/characters.h
index bf87f3103..40c109f63 100644
--- a/src/game/characters.h
+++ b/src/game/characters.h
@@ -4,7 +4,7 @@
 #include "types.h"
 // NOTE: do not include any additional headers
 
-#define PALETTE_MAX 24
+#define PALETTE_MAX 30
 
 enum CharacterType {
     CT_MARIO,
diff --git a/src/game/mario_misc.c b/src/game/mario_misc.c
index f71f12626..cf8b7c2b3 100644
--- a/src/game/mario_misc.c
+++ b/src/game/mario_misc.c
@@ -117,6 +117,13 @@ struct PlayerColor gPlayerColors[PALETTE_MAX] = {
     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),
+    
+    DEFINE_PLAYER_COLOR(0xe7, 0xe7, 0x21, /**/ 0x17, 0x18, 0x15),
+    DEFINE_PLAYER_COLOR(0xaa, 0x27, 0x31, /**/ 0xf7, 0x9a, 0x47),
+    DEFINE_PLAYER_COLOR(0x55, 0x92, 0xb2, /**/ 0xf7, 0xc2, 0x45),
+    DEFINE_PLAYER_COLOR(0x10, 0x1b, 0x2e, /**/ 0xeb, 0x8a, 0x4b),
+    DEFINE_PLAYER_COLOR(0x3b, 0x8f, 0xf7, /**/ 0xd6, 0x35, 0x4d),
+    DEFINE_PLAYER_COLOR(0xff, 0x8e, 0xb2, /**/ 0xd6, 0x35, 0x4d),
 };
 
 const size_t gNumPlayerColors = sizeof(gPlayerColors) / sizeof(*gPlayerColors);
diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c
index eed4eb624..faff7ea47 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -118,6 +118,12 @@ void djui_panel_player_create(struct DjuiBase* caller) {
             "Fire Luigi",
             "Fire Waluigi",
             "Fire Wario",
+            "Busy Bee",
+	    "Fortress",
+	    "Battlements",
+	    "Blueberry Pie",
+	    "B&R",
+	    "Bubblegum",
         };
         struct DjuiSelectionbox* selectionbox2 = djui_selectionbox_create(&body->base, "Palette", paletteChoices, PALETTE_MAX, &configPlayerPalette);
         djui_base_set_size_type(&selectionbox2->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);