From dde4ae2ca9ed8f228e5aa7eaa6ab94a3655b84bb Mon Sep 17 00:00:00 2001
From: AleNinten <85452907+AleNinten@users.noreply.github.com>
Date: Tue, 12 Dec 2023 04:22:52 +0100
Subject: [PATCH] New palettes!

---
 lang/English.ini                | 35 ++++++++++++++++++++-------
 lang/SpanishES.ini              | 27 +++++++++++++++++++++
 lang/SpanishUS.ini              | 27 +++++++++++++++++++++
 src/game/characters.c           | 42 +++++++++++++++++++++++----------
 src/game/characters.h           |  2 +-
 src/pc/djui/djui_panel_player.c | 40 ++++++++++++++++++++++---------
 6 files changed, 141 insertions(+), 32 deletions(-)

diff --git a/lang/English.ini b/lang/English.ini
index af59d0e0..463a4a16 100644
--- a/lang/English.ini
+++ b/lang/English.ini
@@ -317,8 +317,6 @@ MARIO = "Mario"
 LUIGI = "Luigi"
 WALUIGI = "Waluigi"
 WARIO = "Wario"
-CHUCKYA = "Chuckya"
-GOOMBA = "Goomba"
 CLOVER = "Clover"
 COBALT = "Cobalt"
 FURY = "Fury"
@@ -333,19 +331,40 @@ MINT = "Mint"
 EGGPLANT = "Eggplant"
 ORANGE = "Orange"
 ARCTIC = "Arctic"
-FIRE_MARIO = "Fire Mario"
-FIRE_LUIGI = "Fire Luigi"
-FIRE_WALUIGI = "Fire Waluigi"
-FIRE_WARIO = "Fire Wario"
 BUSY_BEE = "Busy Bee"
 FORTRESS = "Fortress"
 BATTLEMENTS = "Battlements"
 BLUEBERRY_PIE = "Blueberry Pie"
 RASPBERRY = "Raspberry"
 BUBBLEGUM = "Bubblegum"
-ICE_MARIO = "Ice Mario"
-ICE_LUIGI = "Ice Luigi"
 TOAD = "Toad"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+TOADETTE = "Toadette"
+TOADSWORTH = "Toadsworth"
+YOSHI = "Yoshi"
+WARIO_WOODS = "Woods' Menace"
+CLASSIC_1 = "Classic Mario"
+CLASSIC_2 = "Classic Luigi"
+CLAUDI = "Claudi"
+JONNY = "Jonny"
+SUNNY = "Sunny"
+NETTY = "Netty"
+TOMMY = "Tommy"
+PEACH = "Peach"
+DAISY = "Daisy"
+SPIKE = "Spike"
+GB = "Game Boy"
+N64 = "64 Memories"
+SNES = "Super Lilac"
+SWITCH = "Switch Neon"
+BLACK = "Jet Black"
+COFFEE = "Coffee Cream"
+MARGIN = "Margin of Night"
+PUMPKIN = "Pumpkin"
+SOIL = "Galactic Soil"
+CREVASE = "Cold Crevase"
+ICE_LUIGI = "Ice Luigi"
 CUSTOM = "Custom"
 
 [PLAYER_LIST]
diff --git a/lang/SpanishES.ini b/lang/SpanishES.ini
index ff0798a7..e46d8c97 100644
--- a/lang/SpanishES.ini
+++ b/lang/SpanishES.ini
@@ -346,6 +346,33 @@ BUBBLEGUM = "Chicle"
 ICE_MARIO = "Mario de Hielo"
 ICE_LUIGI = "Luigi de Hielo"
 TOAD = "Toad"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+TOADETTE = "Toadette"
+TOADSWORTH = "Maestro Kinopio"
+YOSHI = "Yoshi"
+WARIO_WOODS = "Peligro del Bosque"
+CLASSIC_1 = "Mario Clásico"
+CLASSIC_2 = "Luigi Clásico"
+CLAUDI = "Claudi"
+JONNY = "Jonny"
+SUNNY = "Sunny"
+NETTY = "Netty"
+TOMMY = "Tommy"
+PEACH = "Peach"
+DAISY = "Daisy"
+SPIKE = "Spike"
+GB = "Game Boy"
+N64 = "64 Memorias"
+SNES = "Super Lila"
+SWITCH = "Neón Switch"
+BLACK = "Negro Azabache"
+COFFEE = "Crema de Café"
+MARGIN = "Margen de la Noche"
+PUMPKIN = "Calabaza"
+SOIL = "Tierra Galáctica"
+CREVASE = "Grieta Fría"
+ICE_LUIGI = "Luigi de Hielo"
 CUSTOM = "Personalizada"
 
 [PLAYER_LIST]
diff --git a/lang/SpanishUS.ini b/lang/SpanishUS.ini
index 476d1979..fb126399 100644
--- a/lang/SpanishUS.ini
+++ b/lang/SpanishUS.ini
@@ -346,6 +346,33 @@ BUBBLEGUM = "Chicle"
 ICE_MARIO = "Mario de Hielo"
 ICE_LUIGI = "Luigi de Hielo"
 TOAD = "Toad"
+BUCKEN_BERRY = "Bucken Berry"
+ALA_GOLD = "Ala Gold"
+TOADETTE = "Toadette"
+TOADSWORTH = "Maestro Kinopio"
+YOSHI = "Yoshi"
+WARIO_WOODS = "Peligro del Bosque"
+CLASSIC_1 = "Mario Clásico"
+CLASSIC_2 = "Luigi Clásico"
+CLAUDI = "Claudi"
+JONNY = "Jonny"
+SUNNY = "Sunny"
+NETTY = "Netty"
+TOMMY = "Tommy"
+PEACH = "Peach"
+DAISY = "Daisy"
+SPIKE = "Spike"
+GB = "Game Boy"
+N64 = "64 Memorias"
+SNES = "Super Lila"
+SWITCH = "Neón Switch"
+BLACK = "Negro Azabache"
+COFFEE = "Crema de Café"
+MARGIN = "Margen de la Noche"
+PUMPKIN = "Calabaza"
+SOIL = "Tierra Galáctica"
+CREVASE = "Grieta Fría"
+ICE_LUIGI = "Luigi de Hielo"
 CUSTOM = "Personalizada"
 
 [PLAYER_LIST]
diff --git a/src/game/characters.c b/src/game/characters.c
index cfe3b676..7dcabbbe 100644
--- a/src/game/characters.c
+++ b/src/game/characters.c
@@ -1426,12 +1426,31 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 /*  ---- PANTS -----      ---- SHIRT -----      ---- GLOVES ----      ---- SHOES -----      ----- HAIR -----      ----- SKIN -----      ----- CAP ------  */
 {{{ 0x00, 0x00, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x00, 0x00 }}}, // Mario
 {{{ 0x00, 0x00, 0xff }, { 0x00, 0x98, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x00, 0x98, 0x00 }}}, // Luigi
-{{{ 0x16, 0x16, 0x27 }, { 0x61, 0x26, 0xb0 }, { 0xff, 0xff, 0xff }, { 0xfe, 0x76, 0x00 }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x61, 0x26, 0xb0 }}}, // Waluigi
+{{{ 0xff, 0xff, 0xff }, { 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
+{{{ 0xff, 0xff, 0xff }, { 0x00, 0x00, 0xff }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0x00, 0x00, 0xff }}}, // Bucken-Berry
+{{{ 0xff, 0xff, 0xff }, { 0xff, 0xa6, 0x00 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xa6, 0x00 }}}, // Ala-Gold
+{{{ 0xff, 0xff, 0xff }, { 0xff, 0x46, 0xa1 }, { 0xff, 0x46, 0xa1 }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xff, 0xff }}}, // Toadette
+{{{ 0x6c, 0x18, 0x99 }, { 0x72, 0x5e, 0xaa }, { 0xe3, 0xcc, 0x7d }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0x52, 0x35, 0x15 }}}, // Toadsworth
 {{{ 0x7f, 0x20, 0x7a }, { 0xe3, 0xa9, 0x01 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe3, 0xa9, 0x01 }}}, // Wario
-{{{ 0xff, 0x00, 0x00 }, { 0x7b, 0x00, 0xde }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x7b, 0x00, 0xde }}}, // Chuckya
-{{{ 0xc6, 0xb1, 0x32 }, { 0x95, 0x43, 0x01 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x95, 0x43, 0x01 }}}, // Goomba
+{{{ 0x16, 0x16, 0x27 }, { 0x61, 0x26, 0xb0 }, { 0xff, 0xff, 0xff }, { 0xfe, 0x76, 0x00 }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x61, 0x26, 0xb0 }}}, // Waluigi
+{{{ 0xff, 0x00, 0x00 }, { 0x4a, 0xff, 0x20 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Yoshi
+{{{ 0xff, 0xff, 0x29 }, { 0xff, 0x8b, 0xcd }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Claudi (Y)
+{{{ 0xbd, 0x00, 0xff }, { 0x00, 0xee, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Jonny (Y)
+{{{ 0x29, 0xff, 0x31 }, { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Sunny (Y)
+{{{ 0x6a, 0x00, 0xff }, { 0xff, 0x29, 0x62 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Netty (Y)
+{{{ 0xff, 0x00, 0xff }, { 0x39, 0x10, 0xe6 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Tommy (Y)
+{{{ 0xd9, 0xa9, 0xbe }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x1c, 0x5f }, { 0xff, 0xbf, 0x18 }, { 0xfe, 0xc1, 0x79 }, { 0xb6, 0x00, 0x00 }}}, // Peach
+{{{ 0xff, 0xc2, 0x4e }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x1c, 0x5f }, { 0xff, 0x4d, 0x00 }, { 0xf7, 0x95, 0x29 }, { 0xb6, 0x00, 0x00 }}}, // Daisy
+{{{ 0x5b, 0x43, 0x00 }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x5b, 0x43, 0x00 }}}, // Spike
+{{{ 0x3b, 0x8f, 0xf7 }, { 0xd6, 0x35, 0x4d }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3b, 0x8f, 0xf7 }}}, // Classic 1
+{{{ 0x3a, 0x4a, 0x14 }, { 0x31, 0x1c, 0x19 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3a, 0x4a, 0x14 }}}, // Classic 2
+{{{ 0xa2, 0x19, 0xcb }, { 0xdc, 0xbe, 0x96 }, { 0xff, 0xff, 0xff }, { 0x15, 0x15, 0x15 }, { 0x73, 0x53, 0x00 }, { 0xfd, 0x96, 0x83 }, { 0xa2, 0x19, 0xcb }}}, // Wario's Woods
+{{{ 0x4f, 0xa2, 0x50 }, { 0x36, 0x77, 0x4b }, { 0x88, 0xc1, 0x76 }, { 0x22, 0x49, 0x3b }, { 0x22, 0x49, 0x3b }, { 0x88, 0xc1, 0x76 }, { 0x4f, 0xa2, 0x50 }}}, // Game Boy
+{{{ 0x32, 0x99, 0x00 }, { 0xc3, 0x14, 0x20 }, { 0xd5, 0x92, 0x12 }, { 0xd5, 0x92, 0x12 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x16, 0x16, 0x98 }}}, // 64 Memories
+{{{ 0x59, 0x2d, 0x76 }, { 0xad, 0xa8, 0xde }, { 0xdf, 0xdf, 0xd0 }, { 0x3d, 0x3d, 0x3f }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xad, 0xa8, 0xde }}}, // Super Lilac
+{{{ 0x28, 0x28, 0x28 }, { 0xdb, 0x3c, 0x2e }, { 0x00, 0x9d, 0xbd }, { 0x00, 0x9d, 0xbd }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x28, 0x28, 0x28 }}}, // Switch Neon
 {{{ 0x07, 0x09, 0x07 }, { 0x4c, 0x5f, 0x20 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x4c, 0x5f, 0x20 }}}, // Clover
-{{{ 0xbf, 0xde, 0xff }, { 0x00, 0x2f, 0xc8 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x00, 0x2f, 0xc8 }}}, // Cobalt
+{{{ 0x3f, 0x3f, 0xff }, { 0x00, 0x00, 0x00 }, { 0xff, 0xff, 0xff }, { 0x39, 0x0e, 0x07 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3f, 0x3f, 0xff }}}, // Cobalt
 {{{ 0xf8, 0x3b, 0x05 }, { 0x11, 0x11, 0x11 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x11, 0x11, 0x11 }}}, // Fury
 {{{ 0x34, 0x16, 0x0d }, { 0xc1, 0x2c, 0x72 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xc1, 0x2c, 0x72 }}}, // Hot Pink
 {{{ 0xff, 0x00, 0x00 }, { 0xff, 0x96, 0xc8 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x96, 0xc8 }}}, // Nice Pink
@@ -1444,19 +1463,18 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 {{{ 0xe6, 0xe3, 0xff }, { 0x37, 0x32, 0x42 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x37, 0x32, 0x42 }}}, // Eggplant
 {{{ 0x00, 0x51, 0x10 }, { 0xff, 0x8a, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x8a, 0x00 }}}, // Orange
 {{{ 0x4c, 0x1e, 0x3f }, { 0x65, 0xfa, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x65, 0xfa, 0xff }}}, // Arctic
-{{{ 0xb2, 0x28, 0x18 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Mario
-{{{ 0x00, 0x98, 0x00 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Luigi
-{{{ 0x61, 0x26, 0xb0 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0xfe, 0x76, 0x00 }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Waluigi
-{{{ 0xe3, 0xa9, 0x01 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Wario
+{{{ 0x1a, 0x1a, 0x1a }, { 0x2c, 0x2c, 0x2c }, { 0x64, 0x64, 0x64 }, { 0x64, 0x64, 0x64 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x1a, 0x1a, 0x1a }}}, // Jet Black
+{{{ 0xd6, 0x35, 0x4d }, { 0xff, 0x8e, 0xb2 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x8e, 0xb2 }}}, // Bubblegum
 {{{ 0x17, 0x18, 0x15 }, { 0xe7, 0xe7, 0x21 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe7, 0xe7, 0x21 }}}, // Busy Bee
 {{{ 0xf7, 0x9a, 0x47 }, { 0xaa, 0x27, 0x31 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xaa, 0x27, 0x31 }}}, // Fortress
 {{{ 0xf7, 0xc2, 0x45 }, { 0x55, 0x92, 0xb2 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x55, 0x92, 0xb2 }}}, // Battlements
 {{{ 0xeb, 0x8a, 0x4b }, { 0x10, 0x1b, 0x2e }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x10, 0x1b, 0x2e }}}, // Blueberry Pie
-{{{ 0xd6, 0x35, 0x4d }, { 0x3b, 0x8f, 0xf7 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x3b, 0x8f, 0xf7 }}}, // Raspberry
-{{{ 0xd6, 0x35, 0x4d }, { 0xff, 0x8e, 0xb2 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x8e, 0xb2 }}}, // Bubblegum
-{{{ 0xb2, 0x28, 0x18 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Mario
+{{{ 0xb0, 0x9d, 0x6b }, { 0x5d, 0x30, 0x15 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xb0, 0x9d, 0x6b }}}, // Coffee Cream
+{{{ 0x6b, 0x18, 0x18 }, { 0x4c, 0x26, 0x90 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x31, 0x1a, 0x1d }}}, // Margin of Night
+{{{ 0x15, 0x15, 0x15 }, { 0xff, 0x6c, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xff, 0x6c, 0x00 }}}, // Pumpkin
+{{{ 0x50, 0x28, 0x18 }, { 0x43, 0xa7, 0x10 }, { 0xff, 0xff, 0xff }, { 0x6b, 0x41, 0x00 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x48, 0x18, 0x18 }}}, // Universal Soil
+{{{ 0xd4, 0xdf, 0xe7 }, { 0x51, 0xa9, 0x9c }, { 0xff, 0xff, 0xff }, { 0x6b, 0x41, 0x00 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xd4, 0xdf, 0xe7 }}}, // Cold Crevase
 {{{ 0x00, 0x98, 0x00 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Luigi
-{{{ 0xff, 0xff, 0xff }, { 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x00, 0x00, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
 };
 
 enum AnimType {
diff --git a/src/game/characters.h b/src/game/characters.h
index 0cc0d0e3..37967c87 100644
--- a/src/game/characters.h
+++ b/src/game/characters.h
@@ -6,7 +6,7 @@
 #include "mario_animation_ids.h"
 // NOTE: do not include any additional headers
 
-#define PALETTE_PRESET_MAX 33
+#define PALETTE_PRESET_MAX 51
 
 enum PlayerParts {
     PANTS, SHIRT, GLOVES, SHOES, HAIR, SKIN, CAP, PLAYER_PART_MAX, METAL = CAP
diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c
index 23ce11d5..d5bd7b0c 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -275,10 +275,29 @@ void djui_panel_player_create(struct DjuiBase* caller) {
         char* paletteChoices[PALETTE_PRESET_MAX+1] = {
             DLANG(PALETTE, MARIO),
             DLANG(PALETTE, LUIGI),
+            DLANG(PALETTE, TOAD),
+            DLANG(PALETTE, BUCKEN_BERRY),
+            DLANG(PALETTE, ALA_GOLD),
+            DLANG(PALETTE, TOADETTE),
+			DLANG(PALETTE, TOADSWORTH),
+			DLANG(PALETTE, WARIO),
             aprilFools ? "Lame Shitilizer" : DLANG(PALETTE, WALUIGI),
-            DLANG(PALETTE, WARIO),
-            DLANG(PALETTE, CHUCKYA),
-            DLANG(PALETTE, GOOMBA),
+            DLANG(PALETTE, YOSHI),
+            DLANG(PALETTE, CLAUDI),
+            DLANG(PALETTE, JONNY),
+            DLANG(PALETTE, SUNNY),
+            DLANG(PALETTE, NETTY),
+            DLANG(PALETTE, TOMMY),
+            DLANG(PALETTE, PEACH),
+            DLANG(PALETTE, DAISY),
+            DLANG(PALETTE, SPIKE),
+            DLANG(PALETTE, CLASSIC_1),
+            DLANG(PALETTE, CLASSIC_2),
+			DLANG(PALETTE, WARIO_WOODS),
+			DLANG(PALETTE, GB),
+			DLANG(PALETTE, N64),
+			DLANG(PALETTE, SNES),
+			DLANG(PALETTE, SWITCH),
             DLANG(PALETTE, CLOVER),
             DLANG(PALETTE, COBALT),
             DLANG(PALETTE, FURY),
@@ -293,19 +312,18 @@ void djui_panel_player_create(struct DjuiBase* caller) {
             DLANG(PALETTE, EGGPLANT),
             DLANG(PALETTE, ORANGE),
             DLANG(PALETTE, ARCTIC),
-            DLANG(PALETTE, FIRE_MARIO),
-            DLANG(PALETTE, FIRE_LUIGI),
-            DLANG(PALETTE, FIRE_WALUIGI),
-            DLANG(PALETTE, FIRE_WARIO),
+			DLANG(PALETTE, BLACK),
+			DLANG(PALETTE, BUBBLEGUM),
             DLANG(PALETTE, BUSY_BEE),
             DLANG(PALETTE, FORTRESS),
             DLANG(PALETTE, BATTLEMENTS),
             DLANG(PALETTE, BLUEBERRY_PIE),
-            DLANG(PALETTE, RASPBERRY),
-            DLANG(PALETTE, BUBBLEGUM),
-            DLANG(PALETTE, ICE_MARIO),
+			DLANG(PALETTE, COFFEE),
+			DLANG(PALETTE, MARGIN),
+			DLANG(PALETTE, PUMPKIN),
+			DLANG(PALETTE, SOIL),
+			DLANG(PALETTE, CREVASE),
             aprilFools ? "The Shitilizer" : DLANG(PALETTE, ICE_LUIGI),
-            DLANG(PALETTE, TOAD),
             DLANG(PALETTE, CUSTOM),
         };