etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-28 23:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Toadette palette

Browse source
This commit is contained in:
Agent X 2024-03-09 14:18:30 -05:00
parent 836a7cbdd7
commit 74422d16a4
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autogen/lua_definitions/constants.lua
View file

@ -2784,10 +2784,10 @@ PALETTE_WARIO = 3
PALETTE_WALUIGI = 4 PALETTE_WALUIGI = 4
--- @type PalettePreset --- @type PalettePreset
PALETTE_YOSHI = 5 PALETTE_TOADETTE = 5
--- @type PalettePreset --- @type PalettePreset
PALETTE_TOADETTE = 6 PALETTE_YOSHI = 6
--- @type PalettePreset --- @type PalettePreset
PALETTE_BUCKEN_BERRY = 7 PALETTE_BUCKEN_BERRY = 7

4
docs/lua/constants.md
View file

@ -907,8 +907,8 @@
| PALETTE_TOAD | 2 | | PALETTE_TOAD | 2 |
| PALETTE_WARIO | 3 | | PALETTE_WARIO | 3 |
| PALETTE_WALUIGI | 4 | | PALETTE_WALUIGI | 4 |
| PALETTE_YOSHI | 5 | | PALETTE_TOADETTE | 5 |
| PALETTE_TOADETTE | 6 | | PALETTE_YOSHI | 6 |
| PALETTE_BUCKEN_BERRY | 7 | | PALETTE_BUCKEN_BERRY | 7 |
| PALETTE_ALA_GOLD | 8 | | PALETTE_ALA_GOLD | 8 |
| PALETTE_FIRE_MARIO | 9 | | PALETTE_FIRE_MARIO | 9 |

2
src/game/characters.c
View file

@ -1429,8 +1429,8 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
{{{ 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 }, { 0x4c, 0x2c, 0xd3 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x00, 0x00 }}}, // Toad
{{{ 0x7f, 0x20, 0x7a }, { 0xe3, 0xa9, 0x01 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe3, 0xa9, 0x01 }}}, // Wario {{{ 0x7f, 0x20, 0x7a }, { 0xe3, 0xa9, 0x01 }, { 0xff, 0xff, 0xff }, { 0x0e, 0x72, 0x1c }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe3, 0xa9, 0x01 }}}, // Wario
{{{ 0x16, 0x16, 0x27 }, { 0x61, 0x26, 0xb0 }, { 0xff, 0xff, 0xff }, { 0xfe, 0x76, 0x00 }, { 0x73, 0x53, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x61, 0x26, 0xb0 }}}, // Waluigi {{{ 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 }, { 0xff, 0x46, 0xa1 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0x46, 0xa1 }}}, // Toadette
{{{ 0xff, 0x00, 0x00 }, { 0x4a, 0xff, 0x20 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Yoshi {{{ 0xff, 0x00, 0x00 }, { 0x4a, 0xff, 0x20 }, { 0xff, 0xff, 0xff }, { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x00 }, { 0xff, 0xde, 0x39 }, { 0x8b, 0x00, 0x00 }}}, // Yoshi
{{{ 0xff, 0xff, 0xff }, { 0xff, 0x46, 0xa1 }, { 0xff, 0x46, 0xa1 }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xff, 0xff }}}, // Toadette
{{{ 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 }, { 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, 0xa6, 0x00 }, { 0xff, 0xff, 0xff }, { 0x68, 0x40, 0x1b }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xd5, 0xa1 }, { 0xff, 0xa6, 0x00 }}}, // Ala-Gold
{{{ 0xb2, 0x28, 0x18 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Mario {{{ 0xb2, 0x28, 0x18 }, { 0xe6, 0xe6, 0xe6 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xe6, 0xe6, 0xe6 }}}, // Fire Mario

2
src/game/characters.h
View file

@ -12,8 +12,8 @@ enum PalettePreset {
PALETTE_TOAD, PALETTE_TOAD,
PALETTE_WARIO, PALETTE_WARIO,
PALETTE_WALUIGI, PALETTE_WALUIGI,
PALETTE_YOSHI,
PALETTE_TOADETTE, PALETTE_TOADETTE,
PALETTE_YOSHI,
PALETTE_BUCKEN_BERRY, PALETTE_BUCKEN_BERRY,
PALETTE_ALA_GOLD, PALETTE_ALA_GOLD,
PALETTE_FIRE_MARIO, PALETTE_FIRE_MARIO,

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

@ -280,8 +280,8 @@ void djui_panel_player_create(struct DjuiBase* caller) {
DLANG(PALETTE, TOAD), DLANG(PALETTE, TOAD),
DLANG(PALETTE, WARIO), DLANG(PALETTE, WARIO),
aprilFools ? "Lame Shitilizer" : DLANG(PALETTE, WALUIGI), aprilFools ? "Lame Shitilizer" : DLANG(PALETTE, WALUIGI),
DLANG(PALETTE, YOSHI),
DLANG(PALETTE, TOADETTE), DLANG(PALETTE, TOADETTE),
DLANG(PALETTE, YOSHI),
DLANG(PALETTE, BUCKEN_BERRY), DLANG(PALETTE, BUCKEN_BERRY),
DLANG(PALETTE, ALA_GOLD), DLANG(PALETTE, ALA_GOLD),
DLANG(PALETTE, FIRE_MARIO), DLANG(PALETTE, FIRE_MARIO),

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

@ -1096,8 +1096,8 @@ char gSmluaConstants[] = ""
"PALETTE_TOAD = 2\n" "PALETTE_TOAD = 2\n"
"PALETTE_WARIO = 3\n" "PALETTE_WARIO = 3\n"
"PALETTE_WALUIGI = 4\n" "PALETTE_WALUIGI = 4\n"
"PALETTE_YOSHI = 5\n" "PALETTE_TOADETTE = 5\n"
"PALETTE_TOADETTE = 6\n" "PALETTE_YOSHI = 6\n"
"PALETTE_BUCKEN_BERRY = 7\n" "PALETTE_BUCKEN_BERRY = 7\n"
"PALETTE_ALA_GOLD = 8\n" "PALETTE_ALA_GOLD = 8\n"
"PALETTE_FIRE_MARIO = 9\n" "PALETTE_FIRE_MARIO = 9\n"