Rework palette information into palettes.dat (#25681)

* Rework all palette information into new palette.dat * Harmonise order between sprites.json, SpriteIds.h, kPaletteToG1Offset * Rename G1 counterparts for completeness/documentation * Bump libsawyer to v1.4.0
2026-02-01 19:25:12 +01:00 · 2026-01-25 10:39:18 +01:00
parent fa72aaf6b2
commit e6fa0e48d0
206 changed files with 1831 additions and 554 deletions
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -542,246 +542,6 @@
    {
        "path": "loader/loader_gokarts_vehicles.png"
    },
-    {
-        "path": "palette_map/palette_map_dark_olive_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_dark_olive_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_saturated_brown_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_bordeaux_red_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_bordeaux_red_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_grass_green_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_grass_green_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_olive_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_olive_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_saturated_green_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_tan_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_tan_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_dull_purple_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_dull_green_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_dull_green_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_saturated_purple_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_saturated_purple_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_orange_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_aqua_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_magenta_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_dull_brown_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_dull_brown_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_invisible.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_void.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dark_olive_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dark_olive_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_saturated_brown_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_bordeaux_red_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_bordeaux_red_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_grass_green_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_grass_green_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_olive_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_olive_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_saturated_green_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_tan_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_tan_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dull_purple_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dull_green_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dull_green_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_saturated_purple_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_saturated_purple_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_orange_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_aqua_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_magenta_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dull_brown_dark.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_dull_brown_light.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_invisible.png",
-        "palette": "keep",
-        "format": "raw"
-    },
-    {
-        "path": "palette_map/palette_map_glass_void.png",
-        "palette": "keep",
-        "format": "raw"
-    },
    {
        "path": "surface/glassy_recolourable.png",
        "x": -32,
--- a/resources/palettes/base/palette_45.png
+++ b/resources/palettes/base/palette_45.png
--- a/resources/palettes/base/palette_46.png
+++ b/resources/palettes/base/palette_46.png
--- a/resources/palettes/base/palette_51.png
+++ b/resources/palettes/base/palette_51.png
--- a/resources/palettes/base/palette_darken_1.png
+++ b/resources/palettes/base/palette_darken_1.png
--- a/resources/palettes/base/palette_darken_2.png
+++ b/resources/palettes/base/palette_darken_2.png
--- a/resources/palettes/base/palette_darken_3.png
+++ b/resources/palettes/base/palette_darken_3.png
--- a/resources/palettes/base/palette_decreased_contrast.png
+++ b/resources/palettes/base/palette_decreased_contrast.png
--- a/resources/palettes/base/palette_ghost.png
+++ b/resources/palettes/base/palette_ghost.png
--- a/resources/palettes/map_base/palette_map_aqua_dark.png
+++ b/resources/palettes/map_base/palette_map_aqua_dark.png
--- a/resources/palettes/map_base/palette_map_aquamarine.png
+++ b/resources/palettes/map_base/palette_map_aquamarine.png
--- a/resources/palettes/map_base/palette_map_black.png
+++ b/resources/palettes/map_base/palette_map_black.png
--- a/resources/palettes/map_base/palette_map_bordeaux_red.png
+++ b/resources/palettes/map_base/palette_map_bordeaux_red.png
--- a/resources/palettes/map_base/palette_map_bordeaux_red_dark.png
+++ b/resources/palettes/map_base/palette_map_bordeaux_red_dark.png
--- a/resources/palettes/map_base/palette_map_bordeaux_red_light.png
+++ b/resources/palettes/map_base/palette_map_bordeaux_red_light.png
--- a/resources/palettes/map_base/palette_map_bright_green.png
+++ b/resources/palettes/map_base/palette_map_bright_green.png
--- a/resources/palettes/map_base/palette_map_bright_pink.png
+++ b/resources/palettes/map_base/palette_map_bright_pink.png
--- a/resources/palettes/map_base/palette_map_bright_purple.png
+++ b/resources/palettes/map_base/palette_map_bright_purple.png
--- a/resources/palettes/map_base/palette_map_bright_red.png
+++ b/resources/palettes/map_base/palette_map_bright_red.png
--- a/resources/palettes/map_base/palette_map_bright_yellow.png
+++ b/resources/palettes/map_base/palette_map_bright_yellow.png
--- a/resources/palettes/map_base/palette_map_dark_blue.png
+++ b/resources/palettes/map_base/palette_map_dark_blue.png
--- a/resources/palettes/map_base/palette_map_dark_brown.png
+++ b/resources/palettes/map_base/palette_map_dark_brown.png
--- a/resources/palettes/map_base/palette_map_dark_green.png
+++ b/resources/palettes/map_base/palette_map_dark_green.png
--- a/resources/palettes/map_base/palette_map_dark_olive_dark.png
+++ b/resources/palettes/map_base/palette_map_dark_olive_dark.png
--- a/resources/palettes/map_base/palette_map_dark_olive_green.png
+++ b/resources/palettes/map_base/palette_map_dark_olive_green.png
--- a/resources/palettes/map_base/palette_map_dark_olive_light.png
+++ b/resources/palettes/map_base/palette_map_dark_olive_light.png
--- a/resources/palettes/map_base/palette_map_dark_orange.png
+++ b/resources/palettes/map_base/palette_map_dark_orange.png
--- a/resources/palettes/map_base/palette_map_dark_pink.png
+++ b/resources/palettes/map_base/palette_map_dark_pink.png
--- a/resources/palettes/map_base/palette_map_dark_purple.png
+++ b/resources/palettes/map_base/palette_map_dark_purple.png
--- a/resources/palettes/map_base/palette_map_dark_yellow.png
+++ b/resources/palettes/map_base/palette_map_dark_yellow.png
--- a/resources/palettes/map_base/palette_map_dull_brown_dark.png
+++ b/resources/palettes/map_base/palette_map_dull_brown_dark.png
--- a/resources/palettes/map_base/palette_map_dull_brown_light.png
+++ b/resources/palettes/map_base/palette_map_dull_brown_light.png
--- a/resources/palettes/map_base/palette_map_dull_green_dark.png
+++ b/resources/palettes/map_base/palette_map_dull_green_dark.png
--- a/resources/palettes/map_base/palette_map_dull_green_light.png
+++ b/resources/palettes/map_base/palette_map_dull_green_light.png
--- a/resources/palettes/map_base/palette_map_dull_purple_light.png
+++ b/resources/palettes/map_base/palette_map_dull_purple_light.png
--- a/resources/palettes/map_base/palette_map_grass_green_dark.png
+++ b/resources/palettes/map_base/palette_map_grass_green_dark.png
--- a/resources/palettes/map_base/palette_map_grass_green_light.png
+++ b/resources/palettes/map_base/palette_map_grass_green_light.png
--- a/resources/palettes/map_base/palette_map_grey.png
+++ b/resources/palettes/map_base/palette_map_grey.png
--- a/resources/palettes/map_base/palette_map_icy_blue.png
+++ b/resources/palettes/map_base/palette_map_icy_blue.png
--- a/resources/palettes/map_base/palette_map_invisible.png
+++ b/resources/palettes/map_base/palette_map_invisible.png
--- a/resources/palettes/map_base/palette_map_light_blue.png
+++ b/resources/palettes/map_base/palette_map_light_blue.png
--- a/resources/palettes/map_base/palette_map_light_brown.png
+++ b/resources/palettes/map_base/palette_map_light_brown.png
--- a/resources/palettes/map_base/palette_map_light_orange.png
+++ b/resources/palettes/map_base/palette_map_light_orange.png
--- a/resources/palettes/map_base/palette_map_light_pink.png
+++ b/resources/palettes/map_base/palette_map_light_pink.png
--- a/resources/palettes/map_base/palette_map_light_purple.png
+++ b/resources/palettes/map_base/palette_map_light_purple.png
--- a/resources/palettes/map_base/palette_map_magenta_light.png
+++ b/resources/palettes/map_base/palette_map_magenta_light.png
--- a/resources/palettes/map_base/palette_map_moss_green.png
+++ b/resources/palettes/map_base/palette_map_moss_green.png
--- a/resources/palettes/map_base/palette_map_olive_dark.png
+++ b/resources/palettes/map_base/palette_map_olive_dark.png
--- a/resources/palettes/map_base/palette_map_olive_green.png
+++ b/resources/palettes/map_base/palette_map_olive_green.png
--- a/resources/palettes/map_base/palette_map_olive_light.png
+++ b/resources/palettes/map_base/palette_map_olive_light.png
--- a/resources/palettes/map_base/palette_map_orange_light.png
+++ b/resources/palettes/map_base/palette_map_orange_light.png
--- a/resources/palettes/map_base/palette_map_salmon_pink.png
+++ b/resources/palettes/map_base/palette_map_salmon_pink.png
--- a/resources/palettes/map_base/palette_map_saturated_brown.png
+++ b/resources/palettes/map_base/palette_map_saturated_brown.png
--- a/resources/palettes/map_base/palette_map_saturated_brown_light.png
+++ b/resources/palettes/map_base/palette_map_saturated_brown_light.png
--- a/resources/palettes/map_base/palette_map_saturated_green.png
+++ b/resources/palettes/map_base/palette_map_saturated_green.png
--- a/resources/palettes/map_base/palette_map_saturated_green_light.png
+++ b/resources/palettes/map_base/palette_map_saturated_green_light.png
--- a/resources/palettes/map_base/palette_map_saturated_purple_dark.png
+++ b/resources/palettes/map_base/palette_map_saturated_purple_dark.png
--- a/resources/palettes/map_base/palette_map_saturated_purple_light.png
+++ b/resources/palettes/map_base/palette_map_saturated_purple_light.png
--- a/resources/palettes/map_base/palette_map_saturated_red.png
+++ b/resources/palettes/map_base/palette_map_saturated_red.png
--- a/resources/palettes/map_base/palette_map_tan_dark.png
+++ b/resources/palettes/map_base/palette_map_tan_dark.png
--- a/resources/palettes/map_base/palette_map_tan_light.png
+++ b/resources/palettes/map_base/palette_map_tan_light.png
--- a/resources/palettes/map_base/palette_map_teal.png
+++ b/resources/palettes/map_base/palette_map_teal.png
--- a/resources/palettes/map_base/palette_map_void.png
+++ b/resources/palettes/map_base/palette_map_void.png
--- a/resources/palettes/map_base/palette_map_water.png
+++ b/resources/palettes/map_base/palette_map_water.png
--- a/resources/palettes/map_base/palette_map_white.png
+++ b/resources/palettes/map_base/palette_map_white.png
--- a/resources/palettes/map_base/palette_map_yellow.png
+++ b/resources/palettes/map_base/palette_map_yellow.png
--- a/resources/palettes/map_glass/palette_map_glass_aqua_dark.png
+++ b/resources/palettes/map_glass/palette_map_glass_aqua_dark.png
--- a/resources/palettes/map_glass/palette_map_glass_aquamarine.png
+++ b/resources/palettes/map_glass/palette_map_glass_aquamarine.png
--- a/resources/palettes/map_glass/palette_map_glass_black.png
+++ b/resources/palettes/map_glass/palette_map_glass_black.png
--- a/resources/palettes/map_glass/palette_map_glass_bordeaux_red.png
+++ b/resources/palettes/map_glass/palette_map_glass_bordeaux_red.png
--- a/resources/palettes/map_glass/palette_map_glass_bordeaux_red_dark.png
+++ b/resources/palettes/map_glass/palette_map_glass_bordeaux_red_dark.png
--- a/resources/palettes/map_glass/palette_map_glass_bordeaux_red_light.png
+++ b/resources/palettes/map_glass/palette_map_glass_bordeaux_red_light.png
--- a/resources/palettes/map_glass/palette_map_glass_bright_green.png
+++ b/resources/palettes/map_glass/palette_map_glass_bright_green.png
--- a/resources/palettes/map_glass/palette_map_glass_bright_pink.png
+++ b/resources/palettes/map_glass/palette_map_glass_bright_pink.png
--- a/resources/palettes/map_glass/palette_map_glass_bright_purple.png
+++ b/resources/palettes/map_glass/palette_map_glass_bright_purple.png
--- a/resources/palettes/map_glass/palette_map_glass_bright_red.png
+++ b/resources/palettes/map_glass/palette_map_glass_bright_red.png
--- a/resources/palettes/map_glass/palette_map_glass_bright_yellow.png
+++ b/resources/palettes/map_glass/palette_map_glass_bright_yellow.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_blue.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_blue.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_brown.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_brown.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_green.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_green.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_olive_dark.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_olive_dark.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_olive_green.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_olive_green.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_olive_light.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_olive_light.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_orange.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_orange.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_pink.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_pink.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_purple.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_purple.png
--- a/resources/palettes/map_glass/palette_map_glass_dark_yellow.png
+++ b/resources/palettes/map_glass/palette_map_glass_dark_yellow.png
--- a/resources/palettes/map_glass/palette_map_glass_dull_brown_dark.png
+++ b/resources/palettes/map_glass/palette_map_glass_dull_brown_dark.png
--- a/resources/palettes/map_glass/palette_map_glass_dull_brown_light.png
+++ b/resources/palettes/map_glass/palette_map_glass_dull_brown_light.png
--- a/resources/palettes/map_glass/palette_map_glass_dull_green_dark.png
+++ b/resources/palettes/map_glass/palette_map_glass_dull_green_dark.png
--- a/resources/palettes/map_glass/palette_map_glass_dull_green_light.png
+++ b/resources/palettes/map_glass/palette_map_glass_dull_green_light.png
--- a/resources/palettes/map_glass/palette_map_glass_dull_purple_light.png
+++ b/resources/palettes/map_glass/palette_map_glass_dull_purple_light.png
--- a/resources/palettes/map_glass/palette_map_glass_grass_green_dark.png
+++ b/resources/palettes/map_glass/palette_map_glass_grass_green_dark.png
--- a/resources/palettes/map_glass/palette_map_glass_grass_green_light.png
+++ b/resources/palettes/map_glass/palette_map_glass_grass_green_light.png
--- a/resources/palettes/map_glass/palette_map_glass_grey.png
+++ b/resources/palettes/map_glass/palette_map_glass_grey.png
--- a/resources/palettes/map_glass/palette_map_glass_icy_blue.png
+++ b/resources/palettes/map_glass/palette_map_glass_icy_blue.png
--- a/resources/palettes/map_glass/palette_map_glass_invisible.png
+++ b/resources/palettes/map_glass/palette_map_glass_invisible.png
--- a/resources/palettes/map_glass/palette_map_glass_light_blue.png
+++ b/resources/palettes/map_glass/palette_map_glass_light_blue.png
--- a/resources/palettes/map_glass/palette_map_glass_light_brown.png
+++ b/resources/palettes/map_glass/palette_map_glass_light_brown.png
--- a/resources/palettes/map_glass/palette_map_glass_light_orange.png
+++ b/resources/palettes/map_glass/palette_map_glass_light_orange.png
--- a/Show More
+++ b/Show More