thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-03 06:32:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add 5 New Palettes (#31)

Browse source
This commit is contained in:
binarylol 2022-03-13 22:19:39 -04:00 • committed by GitHub
parent 9f20943ff2
commit 4123cf50f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/characters.h
View file

@ -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,

7
src/game/mario_misc.c
View file

@ -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);

6
src/pc/djui/djui_panel_player.c
View file

@ -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);