Added Toad default palette + other palette tweaks (#370)

This commit is contained in:
Skeltan 2023-05-03 09:58:19 +02:00 committed by GitHub
parent 52d70e33a5
commit 2bd2089ed3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 3 deletions

View file

@ -323,6 +323,7 @@ RASPBERRY = "Raspberry"
BUBBLEGUM = "Bubblegum" BUBBLEGUM = "Bubblegum"
ICE_MARIO = "Ice Mario" ICE_MARIO = "Ice Mario"
ICE_LUIGI = "Ice Luigi" ICE_LUIGI = "Ice Luigi"
TOAD = "Toad"
CUSTOM = "Custom" CUSTOM = "Custom"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -323,6 +323,7 @@ RASPBERRY = "Framboise"
BUBBLEGUM = "Bubblegum" BUBBLEGUM = "Bubblegum"
ICE_MARIO = "Mario de glace" ICE_MARIO = "Mario de glace"
ICE_LUIGI = "Luigi de glace" ICE_LUIGI = "Luigi de glace"
TOAD = "Toad"
CUSTOM = "Personnalisée" CUSTOM = "Personnalisée"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -323,6 +323,7 @@ RASPBERRY = "Himbeere"
BUBBLEGUM = "Kaugummi" BUBBLEGUM = "Kaugummi"
ICE_MARIO = "Eis Mario" ICE_MARIO = "Eis Mario"
ICE_LUIGI = "Eis Luigi" ICE_LUIGI = "Eis Luigi"
TOAD = "Toad"
CUSTOM = "Selbstgemacht" CUSTOM = "Selbstgemacht"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -320,6 +320,7 @@ RASPBERRY = "Mora"
BUBBLEGUM = "Gomma da Masticare" BUBBLEGUM = "Gomma da Masticare"
ICE_MARIO = "Mario Ghiaccio" ICE_MARIO = "Mario Ghiaccio"
ICE_LUIGI = "Luigi Ghiaccio" ICE_LUIGI = "Luigi Ghiaccio"
TOAD = "Toad"
CUSTOM = "Personalizzato" CUSTOM = "Personalizzato"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -323,6 +323,7 @@ RASPBERRY = "Framboesa"
BUBBLEGUM = "Chiclete" BUBBLEGUM = "Chiclete"
ICE_MARIO = "Mario de Gelo" ICE_MARIO = "Mario de Gelo"
ICE_LUIGI = "Luigi de Gelo" ICE_LUIGI = "Luigi de Gelo"
TOAD = "Toad"
CUSTOM = "Customizado" CUSTOM = "Customizado"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -322,6 +322,7 @@ RASPBERRY = "Малина"
BUBBLEGUM = "Жвачка" BUBBLEGUM = "Жвачка"
ICE_MARIO = "Ледяной Марио" ICE_MARIO = "Ледяной Марио"
ICE_LUIGI = "Ледяной Луиджи" ICE_LUIGI = "Ледяной Луиджи"
TOAD = "Тоад"s
CUSTOM = "Свой" CUSTOM = "Свой"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -323,6 +323,7 @@ RASPBERRY = "Frambuesa"
BUBBLEGUM = "Chicle" BUBBLEGUM = "Chicle"
ICE_MARIO = "Mario de Hielo" ICE_MARIO = "Mario de Hielo"
ICE_LUIGI = "Luigi de Hielo" ICE_LUIGI = "Luigi de Hielo"
TOAD = "Toad"
CUSTOM = "Personalizada" CUSTOM = "Personalizada"
[PLAYER_LIST] [PLAYER_LIST]

View file

@ -363,8 +363,8 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
/* ---- PANTS ----- ---- SHIRT ----- ---- GLOVES ---- ---- SHOES ----- ----- HAIR ----- ----- SKIN ----- ----- CAP ------ */ /* ---- 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 }, { 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 {{{ 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 {{{ 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 }, { 0xf9, 0xeb, 0x30 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xf9, 0xeb, 0x30 }}}, // Wario {{{ 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 {{{ 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 {{{ 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 {{{ 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 {{{ 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 {{{ 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 {{{ 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 { enum AnimType {

View file

@ -5,7 +5,7 @@
#include "pc/configfile.h" #include "pc/configfile.h"
// NOTE: do not include any additional headers // NOTE: do not include any additional headers
#define PALETTE_PRESET_MAX 32 #define PALETTE_PRESET_MAX 33
enum PlayerParts { enum PlayerParts {
PANTS, SHIRT, GLOVES, SHOES, HAIR, SKIN, CAP, PLAYER_PART_MAX, METAL = CAP PANTS, SHIRT, GLOVES, SHOES, HAIR, SKIN, CAP, PLAYER_PART_MAX, METAL = CAP

View file

@ -298,6 +298,7 @@ void djui_panel_player_create(struct DjuiBase* caller) {
DLANG(PALETTE, BUBBLEGUM), DLANG(PALETTE, BUBBLEGUM),
DLANG(PALETTE, ICE_MARIO), DLANG(PALETTE, ICE_MARIO),
DLANG(PALETTE, ICE_LUIGI), DLANG(PALETTE, ICE_LUIGI),
DLANG(PALETTE, TOAD),
DLANG(PALETTE, CUSTOM), DLANG(PALETTE, CUSTOM),
}; };