etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 21:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ice color palettes (#66)

Browse source 
Ice color palettes

Co-authored-by: MysteryMeatwad <61129329+MysteryMeatwad@users.noreply.github.com>
This commit is contained in:
137329506980462592 2022-04-20 14:21:11 -04:00 committed by GitHub
parent 9e5a45ecdd
commit 8e75268c04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 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" #include "types.h"
// NOTE: do not include any additional headers // NOTE: do not include any additional headers
#define PALETTE_MAX 30 #define PALETTE_MAX 32
enum CharacterType { enum CharacterType {
CT_MARIO, CT_MARIO,

4
src/game/mario_misc.c
View file

@ -114,6 +114,7 @@ struct PlayerColor gPlayerColors[PALETTE_MAX] = {
DEFINE_PLAYER_COLOR(0x37, 0x32, 0x42, /**/ 0xe6, 0xe3, 0xff), DEFINE_PLAYER_COLOR(0x37, 0x32, 0x42, /**/ 0xe6, 0xe3, 0xff),
DEFINE_PLAYER_COLOR(0xff, 0x8a, 0x00, /**/ 0x00, 0x51, 0x10), DEFINE_PLAYER_COLOR(0xff, 0x8a, 0x00, /**/ 0x00, 0x51, 0x10),
DEFINE_PLAYER_COLOR(0x65, 0xfa, 0xff, /**/ 0x4c, 0x1e, 0x3f), DEFINE_PLAYER_COLOR(0x65, 0xfa, 0xff, /**/ 0x4c, 0x1e, 0x3f),
DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0xb2, 0x28, 0x18), DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0xb2, 0x28, 0x18),
DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0x00, 0x98, 0x00), DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0x00, 0x98, 0x00),
DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0x6d, 0x3c, 0x9a), DEFINE_PLAYER_COLOR(0xe6, 0xe6, 0xe6, /**/ 0x6d, 0x3c, 0x9a),
@ -125,6 +126,9 @@ struct PlayerColor gPlayerColors[PALETTE_MAX] = {
DEFINE_PLAYER_COLOR(0x10, 0x1b, 0x2e, /**/ 0xeb, 0x8a, 0x4b), DEFINE_PLAYER_COLOR(0x10, 0x1b, 0x2e, /**/ 0xeb, 0x8a, 0x4b),
DEFINE_PLAYER_COLOR(0x3b, 0x8f, 0xf7, /**/ 0xd6, 0x35, 0x4d), DEFINE_PLAYER_COLOR(0x3b, 0x8f, 0xf7, /**/ 0xd6, 0x35, 0x4d),
DEFINE_PLAYER_COLOR(0xff, 0x8e, 0xb2, /**/ 0xd6, 0x35, 0x4d), DEFINE_PLAYER_COLOR(0xff, 0x8e, 0xb2, /**/ 0xd6, 0x35, 0x4d),
DEFINE_PLAYER_COLOR(0x47, 0xc5, 0xff, /**/ 0xb2, 0x28, 0x18),
DEFINE_PLAYER_COLOR(0x47, 0xc5, 0xff, /**/ 0x00, 0x98, 0x00),
}; };
const size_t gNumPlayerColors = sizeof(gPlayerColors) / sizeof(*gPlayerColors); const size_t gNumPlayerColors = sizeof(gPlayerColors) / sizeof(*gPlayerColors);

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

@ -124,6 +124,8 @@ void djui_panel_player_create(struct DjuiBase* caller) {
"Blueberry Pie", "Blueberry Pie",
"Raspberry", "Raspberry",
"Bubblegum", "Bubblegum",
"Ice Mario",
"Ice Luigi",
}; };
struct DjuiSelectionbox* selectionbox2 = djui_selectionbox_create(&body->base, "Palette", paletteChoices, PALETTE_MAX, &configPlayerPalette); 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); djui_base_set_size_type(&selectionbox2->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);

2
src/pc/lua/smlua_constants_autogen.c
View file

@ -1022,7 +1022,7 @@ char gSmluaConstants[] = ""
"CAM_EVENT_START_ENDING = 11\n" "CAM_EVENT_START_ENDING = 11\n"
"CAM_EVENT_START_END_WAVING = 12\n" "CAM_EVENT_START_END_WAVING = 12\n"
"CAM_EVENT_START_CREDITS = 13\n" "CAM_EVENT_START_CREDITS = 13\n"
"PALETTE_MAX = 30\n" "PALETTE_MAX = 32\n"
"CT_MARIO = 0\n" "CT_MARIO = 0\n"
"CT_LUIGI = 1\n" "CT_LUIGI = 1\n"
"CT_TOAD = 2\n" "CT_TOAD = 2\n"