From 2bd2089ed3d3e0f7cc50db11fb0912a711657548 Mon Sep 17 00:00:00 2001
From: Skeltan <110261917+Skeltan@users.noreply.github.com>
Date: Wed, 3 May 2023 09:58:19 +0200
Subject: [PATCH] Added Toad default palette + other palette tweaks (#370)

---
 lang/English.ini                | 1 +
 lang/French.ini                 | 1 +
 lang/German.ini                 | 1 +
 lang/Italian.ini                | 1 +
 lang/Portuguese.ini             | 1 +
 lang/Russian.ini                | 1 +
 lang/Spanish.ini                | 1 +
 src/game/characters.c           | 5 +++--
 src/game/characters.h           | 2 +-
 src/pc/djui/djui_panel_player.c | 1 +
 10 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lang/English.ini b/lang/English.ini
index c28677799..27efbd09a 100644
--- a/lang/English.ini
+++ b/lang/English.ini
@@ -323,6 +323,7 @@ RASPBERRY = "Raspberry"
 BUBBLEGUM = "Bubblegum"
 ICE_MARIO = "Ice Mario"
 ICE_LUIGI = "Ice Luigi"
+TOAD = "Toad"
 CUSTOM = "Custom"
 
 [PLAYER_LIST]
diff --git a/lang/French.ini b/lang/French.ini
index 23d819f97..22b7ef90b 100644
--- a/lang/French.ini
+++ b/lang/French.ini
@@ -323,6 +323,7 @@ RASPBERRY = "Framboise"
 BUBBLEGUM = "Bubblegum"
 ICE_MARIO = "Mario de glace"
 ICE_LUIGI = "Luigi de glace"
+TOAD = "Toad"
 CUSTOM = "Personnalisée"
 
 [PLAYER_LIST]
diff --git a/lang/German.ini b/lang/German.ini
index 8b238c1cd..f3c0efe61 100644
--- a/lang/German.ini
+++ b/lang/German.ini
@@ -323,6 +323,7 @@ RASPBERRY = "Himbeere"
 BUBBLEGUM = "Kaugummi"
 ICE_MARIO = "Eis Mario"
 ICE_LUIGI = "Eis Luigi"
+TOAD = "Toad"
 CUSTOM = "Selbstgemacht"
 
 [PLAYER_LIST]
diff --git a/lang/Italian.ini b/lang/Italian.ini
index 002624cc9..e5443135c 100644
--- a/lang/Italian.ini
+++ b/lang/Italian.ini
@@ -320,6 +320,7 @@ RASPBERRY = "Mora"
 BUBBLEGUM = "Gomma da Masticare"
 ICE_MARIO = "Mario Ghiaccio"
 ICE_LUIGI = "Luigi Ghiaccio"
+TOAD = "Toad"
 CUSTOM = "Personalizzato"
 
 [PLAYER_LIST]
diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini
index 29564b637..09d12f520 100644
--- a/lang/Portuguese.ini
+++ b/lang/Portuguese.ini
@@ -323,6 +323,7 @@ RASPBERRY = "Framboesa"
 BUBBLEGUM = "Chiclete"
 ICE_MARIO = "Mario de Gelo"
 ICE_LUIGI = "Luigi de Gelo"
+TOAD = "Toad"
 CUSTOM = "Customizado"
 
 [PLAYER_LIST]
diff --git a/lang/Russian.ini b/lang/Russian.ini
index f1db254b0..9c784775e 100644
--- a/lang/Russian.ini
+++ b/lang/Russian.ini
@@ -322,6 +322,7 @@ RASPBERRY = "Малина"
 BUBBLEGUM = "Жвачка"
 ICE_MARIO = "Ледяной Марио"
 ICE_LUIGI = "Ледяной Луиджи"
+TOAD = "Тоад"s
 CUSTOM = "Свой"
 
 [PLAYER_LIST]
diff --git a/lang/Spanish.ini b/lang/Spanish.ini
index ca49c9735..1b92e4494 100644
--- a/lang/Spanish.ini
+++ b/lang/Spanish.ini
@@ -323,6 +323,7 @@ RASPBERRY = "Frambuesa"
 BUBBLEGUM = "Chicle"
 ICE_MARIO = "Mario de Hielo"
 ICE_LUIGI = "Luigi de Hielo"
+TOAD = "Toad"
 CUSTOM = "Personalizada"
 
 [PLAYER_LIST]
diff --git a/src/game/characters.c b/src/game/characters.c
index b6a53cace..684375a1d 100644
--- a/src/game/characters.c
+++ b/src/game/characters.c
@@ -363,8 +363,8 @@ 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, 0xfe }, { 0x00, 0x98, 0x00 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x00, 0x98, 0x00 }}}, // Luigi
-{{{ 0x2c, 0x26, 0x3f }, { 0x6d, 0x3c, 0x9a }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x6d, 0x3c, 0x9a }}}, // Waluigi
-{{{ 0x7f, 0x20, 0x7a }, { 0xf9, 0xeb, 0x30 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xf9, 0xeb, 0x30 }}}, // Wario
+{{{ 0x2c, 0x26, 0x3f }, { 0x61, 0x26, 0xb0 }, { 0xff, 0xff, 0xff }, { 0xfe, 0x76, 0x00 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x61, 0x26, 0xb0 }}}, // Waluigi
+{{{ 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
 {{{ 0x07, 0x09, 0x07 }, { 0x4c, 0x5f, 0x20 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x4c, 0x5f, 0x20 }}}, // Clover
@@ -393,6 +393,7 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 {{{ 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
 {{{ 0x00, 0x98, 0x00 }, { 0x47, 0xc5, 0xff }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x47, 0xc5, 0xff }}}, // Ice Luigi
+{{{ 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
 };
 
 enum AnimType {
diff --git a/src/game/characters.h b/src/game/characters.h
index 8606ebe72..726fca4b3 100644
--- a/src/game/characters.h
+++ b/src/game/characters.h
@@ -5,7 +5,7 @@
 #include "pc/configfile.h"
 // NOTE: do not include any additional headers
 
-#define PALETTE_PRESET_MAX 32
+#define PALETTE_PRESET_MAX 33
 
 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 a05d87b06..22e0e2d54 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -298,6 +298,7 @@ void djui_panel_player_create(struct DjuiBase* caller) {
             DLANG(PALETTE, BUBBLEGUM),
             DLANG(PALETTE, ICE_MARIO),
             DLANG(PALETTE, ICE_LUIGI),
+            DLANG(PALETTE, TOAD),
             DLANG(PALETTE, CUSTOM),
         };