Re-add 64 Memories palette

2023-12-15 20:25:23 -05:00 · 2023-12-15 20:25:23 -05:00 · 0a210993ae
parent 6d68d4cf63
commit 0a210993ae
17 changed files with 107 additions and 89 deletions
--- a/autogen/lua_definitions/constants.lua
+++ b/autogen/lua_definitions/constants.lua
@ -2595,9 +2595,6 @@ RCO_ALL_EXCEPT_BOWSER = 1
 --- @type RomhackCameraOverride
 RCO_NONE = 2

--- @type integer
-PALETTE_PRESET_MAX = 45
-
 --- @class CharacterSound

 --- @type CharacterSound
@ -2812,85 +2809,91 @@ PALETTE_WARIO_WOODS = 16
 PALETTE_GB = 17

 --- @type PalettePreset
-PALETTE_SNES = 18
+PALETTE_N64 = 18

 --- @type PalettePreset
-PALETTE_SWITCH = 19
+PALETTE_SNES = 19

 --- @type PalettePreset
-PALETTE_CLOVER = 20
+PALETTE_SWITCH = 20

 --- @type PalettePreset
-PALETTE_COBALT = 21
+PALETTE_CLOVER = 21

 --- @type PalettePreset
-PALETTE_RUBY = 22
+PALETTE_COBALT = 22

 --- @type PalettePreset
-PALETTE_FURY = 23
+PALETTE_RUBY = 23

 --- @type PalettePreset
-PALETTE_HOT_PINK = 24
+PALETTE_FURY = 24

 --- @type PalettePreset
-PALETTE_NICE_PINK = 25
+PALETTE_HOT_PINK = 25

 --- @type PalettePreset
-PALETTE_SEAFOAM = 26
+PALETTE_NICE_PINK = 26

 --- @type PalettePreset
-PALETTE_LILAC = 27
+PALETTE_SEAFOAM = 27

 --- @type PalettePreset
-PALETTE_COPPER = 28
+PALETTE_LILAC = 28

 --- @type PalettePreset
-PALETTE_AZURE = 29
+PALETTE_COPPER = 29

 --- @type PalettePreset
-PALETTE_BURGUNDY = 30
+PALETTE_AZURE = 30

 --- @type PalettePreset
-PALETTE_MINT = 31
+PALETTE_BURGUNDY = 31

 --- @type PalettePreset
-PALETTE_ORANGE = 32
+PALETTE_MINT = 32

 --- @type PalettePreset
-PALETTE_ARCTIC = 33
+PALETTE_ORANGE = 33

 --- @type PalettePreset
-PALETTE_BLACK = 34
+PALETTE_ARCTIC = 34

 --- @type PalettePreset
-PALETTE_BUBBLEGUM = 35
+PALETTE_BLACK = 35

 --- @type PalettePreset
-PALETTE_BUSY_BEE = 36
+PALETTE_BUBBLEGUM = 36

 --- @type PalettePreset
-PALETTE_FORTRESS = 37
+PALETTE_BUSY_BEE = 37

 --- @type PalettePreset
-PALETTE_BLUEBERRY_PIE = 38
+PALETTE_FORTRESS = 38

 --- @type PalettePreset
-PALETTE_RASPBERRY = 39
+PALETTE_BLUEBERRY_PIE = 39

 --- @type PalettePreset
-PALETTE_COFFEE = 40
+PALETTE_RASPBERRY = 40

 --- @type PalettePreset
-PALETTE_MARGIN = 41
+PALETTE_COFFEE = 41

 --- @type PalettePreset
-PALETTE_PUMPKIN = 42
+PALETTE_MARGIN = 42

 --- @type PalettePreset
-PALETTE_SOIL = 43
+PALETTE_PUMPKIN = 43

 --- @type PalettePreset
-PALETTE_CREVASE = 44
+PALETTE_SOIL = 44
+
+--- @type PalettePreset
+PALETTE_CREVASE = 45
+
+--- @type PalettePreset
+PALETTE_PRESET_MAX = 46

 --- @class PlayerPart

--- a/docs/lua/constants.md
+++ b/docs/lua/constants.md
@ -839,7 +839,6 @@
 <br />

 ## [characters.h](#characters.h)
- PALETTE_PRESET_MAX

 ### [enum CharacterSound](#CharacterSound)
 | Identifier | Value |
@ -921,33 +920,35 @@
 | PALETTE_DAISY | 15 |
 | PALETTE_WARIO_WOODS | 16 |
 | PALETTE_GB | 17 |
-| PALETTE_SNES | 18 |
-| PALETTE_SWITCH | 19 |
-| PALETTE_CLOVER | 20 |
-| PALETTE_COBALT | 21 |
-| PALETTE_RUBY | 22 |
-| PALETTE_FURY | 23 |
-| PALETTE_HOT_PINK | 24 |
-| PALETTE_NICE_PINK | 25 |
-| PALETTE_SEAFOAM | 26 |
-| PALETTE_LILAC | 27 |
-| PALETTE_COPPER | 28 |
-| PALETTE_AZURE | 29 |
-| PALETTE_BURGUNDY | 30 |
-| PALETTE_MINT | 31 |
-| PALETTE_ORANGE | 32 |
-| PALETTE_ARCTIC | 33 |
-| PALETTE_BLACK | 34 |
-| PALETTE_BUBBLEGUM | 35 |
-| PALETTE_BUSY_BEE | 36 |
-| PALETTE_FORTRESS | 37 |
-| PALETTE_BLUEBERRY_PIE | 38 |
-| PALETTE_RASPBERRY | 39 |
-| PALETTE_COFFEE | 40 |
-| PALETTE_MARGIN | 41 |
-| PALETTE_PUMPKIN | 42 |
-| PALETTE_SOIL | 43 |
-| PALETTE_CREVASE | 44 |
+| PALETTE_N64 | 18 |
+| PALETTE_SNES | 19 |
+| PALETTE_SWITCH | 20 |
+| PALETTE_CLOVER | 21 |
+| PALETTE_COBALT | 22 |
+| PALETTE_RUBY | 23 |
+| PALETTE_FURY | 24 |
+| PALETTE_HOT_PINK | 25 |
+| PALETTE_NICE_PINK | 26 |
+| PALETTE_SEAFOAM | 27 |
+| PALETTE_LILAC | 28 |
+| PALETTE_COPPER | 29 |
+| PALETTE_AZURE | 30 |
+| PALETTE_BURGUNDY | 31 |
+| PALETTE_MINT | 32 |
+| PALETTE_ORANGE | 33 |
+| PALETTE_ARCTIC | 34 |
+| PALETTE_BLACK | 35 |
+| PALETTE_BUBBLEGUM | 36 |
+| PALETTE_BUSY_BEE | 37 |
+| PALETTE_FORTRESS | 38 |
+| PALETTE_BLUEBERRY_PIE | 39 |
+| PALETTE_RASPBERRY | 40 |
+| PALETTE_COFFEE | 41 |
+| PALETTE_MARGIN | 42 |
+| PALETTE_PUMPKIN | 43 |
+| PALETTE_SOIL | 44 |
+| PALETTE_CREVASE | 45 |
+| PALETTE_PRESET_MAX | 46 |

 ### [enum PlayerPart](#PlayerPart)
 | Identifier | Value |
--- a/lang/Czech.ini
+++ b/lang/Czech.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Woods' Menace"
 GB = "Game Boy"
+N64 = "N64 Vzpomínky"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Clover"
--- a/lang/Dutch.ini
+++ b/lang/Dutch.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Woods' Menace"
 GB = "Game Boy"
+N64 = "N64 Herinneringen"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Clover"
--- a/lang/English.ini
+++ b/lang/English.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Woods' Menace"
 GB = "Game Boy"
+N64 = "N64 Memories"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Clover"
--- a/lang/French.ini
+++ b/lang/French.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Menace des bois de Wario"
 GB = "Game Boy"
+N64 = "Souvenirs N64"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Trèfle"
--- a/lang/German.ini
+++ b/lang/German.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Bedrohung des Waldes"
 GB = "Game Boy"
+N64 = "N64 Erinnerungen"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Klee"
--- a/lang/Italian.ini
+++ b/lang/Italian.ini
@ -329,6 +329,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Minaccia del Bosco di Wario"
 GB = "Game Boy"
+N64 = "Ricordi N64"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Trifoglio"
--- a/lang/Polish.ini
+++ b/lang/Polish.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Zagrożenie lasów"
 GB = "Game Boy"
+N64 = "Wspomnienia z N64"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Koniczyna"
--- a/lang/Portuguese.ini
+++ b/lang/Portuguese.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Ameaça dos Bosques"
 GB = "Game Boy"
+N64 = "Memórias N64"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Trevo"
--- a/lang/Russian.ini
+++ b/lang/Russian.ini
@ -330,6 +330,7 @@ PEACH = "Пич"
 DAISY = "Дейзи"
 WARIO_WOODS = "Угроза лесов"
 GB = "Гейм Бой"
+N64 = "Воспоминания N64"
 SNES = "Супер Лилак"
 SWITCH = "Свитч Неон"
 CLOVER = "Клевер"
--- a/lang/SpanishES.ini
+++ b/lang/SpanishES.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Amenaza del Bosque de Wario"
 GB = "Game Boy"
+N64 = "Recuerdos N64"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Trébol"
--- a/lang/SpanishUS.ini
+++ b/lang/SpanishUS.ini
@ -331,6 +331,7 @@ PEACH = "Peach"
 DAISY = "Daisy"
 WARIO_WOODS = "Amenaza del Bosque de Wario"
 GB = "Game Boy"
+N64 = "Recuerdos N64"
 SNES = "Super Lilac"
 SWITCH = "Switch Neon"
 CLOVER = "Trébol"
--- a/src/game/characters.c
+++ b/src/game/characters.c
@ -1442,6 +1442,7 @@ const struct PlayerPalette gPalettePresets[PALETTE_PRESET_MAX] = {
 {{{ 0xff, 0xc2, 0x4e }, { 0xff, 0xff, 0xff }, { 0xff, 0xff, 0xff }, { 0xff, 0x1c, 0x5f }, { 0xff, 0x4d, 0x00 }, { 0xf7, 0x95, 0x29 }, { 0xb6, 0x00, 0x00 }}}, // Daisy
 {{{ 0xa2, 0x19, 0xcb }, { 0xdc, 0xbe, 0x96 }, { 0xff, 0xff, 0xff }, { 0x15, 0x15, 0x15 }, { 0x73, 0x53, 0x00 }, { 0xfd, 0x96, 0x83 }, { 0xa2, 0x19, 0xcb }}}, // Wario's Woods
 {{{ 0x4f, 0xa2, 0x50 }, { 0x36, 0x77, 0x4b }, { 0x88, 0xc1, 0x76 }, { 0x22, 0x49, 0x3b }, { 0x22, 0x49, 0x3b }, { 0x88, 0xc1, 0x76 }, { 0x4f, 0xa2, 0x50 }}}, // Game Boy
+{{{ 0x32, 0x99, 0x00 }, { 0xc3, 0x14, 0x20 }, { 0xd5, 0x92, 0x12 }, { 0xd5, 0x92, 0x12 }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x16, 0x16, 0x98 }}}, // N64 Memories
 {{{ 0x59, 0x2d, 0x76 }, { 0xad, 0xa8, 0xde }, { 0xdf, 0xdf, 0xd0 }, { 0x3d, 0x3d, 0x3f }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0xad, 0xa8, 0xde }}}, // Super Lilac
 {{{ 0x28, 0x28, 0x28 }, { 0xdb, 0x3c, 0x2e }, { 0x00, 0x9d, 0xbd }, { 0x00, 0x9d, 0xbd }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x28, 0x28, 0x28 }}}, // Switch Neon
 {{{ 0x07, 0x09, 0x07 }, { 0x4c, 0x5f, 0x20 }, { 0xff, 0xff, 0xff }, { 0x72, 0x1c, 0x0e }, { 0x73, 0x06, 0x00 }, { 0xfe, 0xc1, 0x79 }, { 0x4c, 0x5f, 0x20 }}}, // Clover
--- a/src/game/characters.h
+++ b/src/game/characters.h
@ -6,8 +6,6 @@
 #include "mario_animation_ids.h"
 // NOTE: do not include any additional headers

-#define PALETTE_PRESET_MAX 45
-
 enum PalettePreset {
    PALETTE_MARIO,
    PALETTE_LUIGI,
@ -27,6 +25,7 @@ enum PalettePreset {
    PALETTE_DAISY,
    PALETTE_WARIO_WOODS,
    PALETTE_GB,
+    PALETTE_N64,
    PALETTE_SNES,
    PALETTE_SWITCH,
    PALETTE_CLOVER,
@ -53,7 +52,8 @@ enum PalettePreset {
    PALETTE_MARGIN,
    PALETTE_PUMPKIN,
    PALETTE_SOIL,
-    PALETTE_CREVASE
+    PALETTE_CREVASE,
+    PALETTE_PRESET_MAX
 };

 enum PlayerPart {
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@ -291,6 +291,7 @@ void djui_panel_player_create(struct DjuiBase* caller) {
            DLANG(PALETTE, DAISY),
            DLANG(PALETTE, WARIO_WOODS),
            DLANG(PALETTE, GB),
+            DLANG(PALETTE, N64),
            DLANG(PALETTE, SNES),
            DLANG(PALETTE, SWITCH),
            DLANG(PALETTE, CLOVER),
--- a/src/pc/lua/smlua_constants_autogen.c
+++ b/src/pc/lua/smlua_constants_autogen.c
@ -1081,7 +1081,6 @@ char gSmluaConstants[] = ""
 "CAM_EVENT_START_ENDING = 11\n"
 "CAM_EVENT_START_END_WAVING = 12\n"
 "CAM_EVENT_START_CREDITS = 13\n"
-"PALETTE_PRESET_MAX = 45\n"
 "PALETTE_MARIO = 0\n"
 "PALETTE_LUIGI = 1\n"
 "PALETTE_TOAD = 2\n"
@ -1100,33 +1099,35 @@ char gSmluaConstants[] = ""
 "PALETTE_DAISY = 15\n"
 "PALETTE_WARIO_WOODS = 16\n"
 "PALETTE_GB = 17\n"
-"PALETTE_SNES = 18\n"
-"PALETTE_SWITCH = 19\n"
-"PALETTE_CLOVER = 20\n"
-"PALETTE_COBALT = 21\n"
-"PALETTE_RUBY = 22\n"
-"PALETTE_FURY = 23\n"
-"PALETTE_HOT_PINK = 24\n"
-"PALETTE_NICE_PINK = 25\n"
-"PALETTE_SEAFOAM = 26\n"
-"PALETTE_LILAC = 27\n"
-"PALETTE_COPPER = 28\n"
-"PALETTE_AZURE = 29\n"
-"PALETTE_BURGUNDY = 30\n"
-"PALETTE_MINT = 31\n"
-"PALETTE_ORANGE = 32\n"
-"PALETTE_ARCTIC = 33\n"
-"PALETTE_BLACK = 34\n"
-"PALETTE_BUBBLEGUM = 35\n"
-"PALETTE_BUSY_BEE = 36\n"
-"PALETTE_FORTRESS = 37\n"
-"PALETTE_BLUEBERRY_PIE = 38\n"
-"PALETTE_RASPBERRY = 39\n"
-"PALETTE_COFFEE = 40\n"
-"PALETTE_MARGIN = 41\n"
-"PALETTE_PUMPKIN = 42\n"
-"PALETTE_SOIL = 43\n"
-"PALETTE_CREVASE = 44\n"
+"PALETTE_N64 = 18\n"
+"PALETTE_SNES = 19\n"
+"PALETTE_SWITCH = 20\n"
+"PALETTE_CLOVER = 21\n"
+"PALETTE_COBALT = 22\n"
+"PALETTE_RUBY = 23\n"
+"PALETTE_FURY = 24\n"
+"PALETTE_HOT_PINK = 25\n"
+"PALETTE_NICE_PINK = 26\n"
+"PALETTE_SEAFOAM = 27\n"
+"PALETTE_LILAC = 28\n"
+"PALETTE_COPPER = 29\n"
+"PALETTE_AZURE = 30\n"
+"PALETTE_BURGUNDY = 31\n"
+"PALETTE_MINT = 32\n"
+"PALETTE_ORANGE = 33\n"
+"PALETTE_ARCTIC = 34\n"
+"PALETTE_BLACK = 35\n"
+"PALETTE_BUBBLEGUM = 36\n"
+"PALETTE_BUSY_BEE = 37\n"
+"PALETTE_FORTRESS = 38\n"
+"PALETTE_BLUEBERRY_PIE = 39\n"
+"PALETTE_RASPBERRY = 40\n"
+"PALETTE_COFFEE = 41\n"
+"PALETTE_MARGIN = 42\n"
+"PALETTE_PUMPKIN = 43\n"
+"PALETTE_SOIL = 44\n"
+"PALETTE_CREVASE = 45\n"
+"PALETTE_PRESET_MAX = 46\n"
 "PANTS = 0\n"
 "SHIRT = 1\n"
 "GLOVES = 2\n"