From 5ec455b738cbaf63bc89dc14cb3684ce7a6e6a32 Mon Sep 17 00:00:00 2001 From: Daryl Borth Date: Sat, 18 Aug 2018 13:08:09 -0600 Subject: [PATCH] update color palettes (thanks Tanooki16!) --- source/fceultra/palettes/rp2c04001.h | 122 +++++++-------- source/fceultra/palettes/rp2c04002.h | 120 +++++++-------- source/fceultra/palettes/rp2c04003.h | 120 +++++++-------- source/fceultra/palettes/rp2c05004.h | 120 +++++++-------- source/gcvideo.cpp | 212 +++++++++++++++------------ source/gcvideo.h | 2 +- source/menu.cpp | 2 +- 7 files changed, 365 insertions(+), 333 deletions(-) diff --git a/source/fceultra/palettes/rp2c04001.h b/source/fceultra/palettes/rp2c04001.h index a7bdb7c..09d1106 100644 --- a/source/fceultra/palettes/rp2c04001.h +++ b/source/fceultra/palettes/rp2c04001.h @@ -1,64 +1,64 @@ -{0xfc, 0xc4, 0xd8}, -{0x40, 0x88, 0xfc}, -{0xd8, 0x28, 0x00}, -{0x5c, 0x94, 0xfc}, -{0x00, 0x80, 0x88}, -{0x00, 0x44, 0x00}, +{0xff, 0xb6, 0xb6}, +{0xda, 0x6d, 0xff}, +{0xff, 0x00, 0x00}, +{0x91, 0x91, 0xff}, +{0x00, 0x91, 0x91}, +{0x24, 0x48, 0x00}, +{0x48, 0x48, 0x48}, +{0xff, 0x00, 0x91}, +{0xff, 0xff, 0xff}, +{0x6d, 0x6d, 0x6d}, +{0xff, 0xb6, 0x00}, +{0xb6, 0x00, 0x6d}, +{0x91, 0x00, 0x6d}, +{0xda, 0xda, 0x00}, +{0x6d, 0x48, 0x00}, +{0xff, 0xff, 0xff}, +{0x6d, 0xb6, 0xff}, +{0xda, 0xb6, 0x6d}, +{0x6d, 0x24, 0x00}, +{0x6d, 0xda, 0x00}, +{0x91, 0xda, 0xff}, +{0xda, 0xb6, 0xff}, +{0xff, 0xda, 0x91}, +{0x00, 0x48, 0xff}, +{0xff, 0xda, 0x00}, +{0x48, 0xff, 0xda}, {0x00, 0x00, 0x00}, -{0xe4, 0x00, 0x58}, -{0xfc, 0xfc, 0xfc}, -{0x74, 0x74, 0x74}, -{0xfc, 0x98, 0x38}, -{0xa8, 0x00, 0x10}, -{0x8c, 0x00, 0x74}, -{0xfc, 0x98, 0x38}, -{0x40, 0x2c, 0x00}, -{0xfc, 0xfc, 0xfc}, -{0x3c, 0xbc, 0xfc}, +{0x48, 0x00, 0x00}, +{0xda, 0xda, 0xda}, +{0x91, 0x91, 0x91}, +{0xff, 0x00, 0xff}, +{0x00, 0x24, 0x91}, +{0x00, 0x00, 0x6d}, +{0xb6, 0xda, 0xff}, +{0xff, 0xb6, 0xff}, +{0x00, 0xff, 0x00}, +{0x00, 0xff, 0xff}, +{0x00, 0x48, 0x48}, +{0x00, 0xb6, 0x6d}, +{0xb6, 0x00, 0xff}, +{0x00, 0x00, 0x00}, +{0x91, 0x48, 0x00}, +{0xff, 0x91, 0xff}, +{0xb6, 0x24, 0x00}, +{0x91, 0x00, 0xff}, +{0x00, 0x00, 0xda}, +{0xff, 0x91, 0x00}, {0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}, -{0x80, 0xd0, 0x10}, -{0x9c, 0xfc, 0xf0}, -{0xc4, 0xd4, 0xfc}, -{0xfc, 0xbc, 0xb0}, -{0x20, 0x38, 0xec}, -{0x00, 0x00, 0x00}, -{0x58, 0xf8, 0x98}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0xfc, 0xfc}, -{0xbc, 0xbc, 0xbc}, -{0xf4, 0x78, 0xfc}, -{0x24, 0x18, 0x8c}, -{0x00, 0x00, 0x00}, -{0xa8, 0xe4, 0xfc}, -{0x00, 0x00, 0x00}, -{0x4c, 0xdc, 0x48}, -{0x00, 0xe8, 0xd8}, -{0x18, 0x3c, 0x5c}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x7c, 0x08, 0x00}, -{0xfc, 0xc4, 0xfc}, -{0xa4, 0x00, 0x00}, -{0x80, 0x00, 0xf0}, -{0x00, 0x00, 0xa8}, -{0xfc, 0x74, 0x60}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x94, 0x00}, -{0xbc, 0xbc, 0xbc}, -{0x00, 0x50, 0x00}, -{0xe0, 0xfc, 0xa0}, -{0x00, 0x00, 0x00}, -{0xfc, 0xd8, 0xa8}, -{0xc8, 0x4c, 0x0c}, -{0x00, 0x00, 0x00}, -{0x00, 0x70, 0xec}, -{0x00, 0x44, 0x00}, -{0x00, 0x00, 0x00}, -{0xe0, 0xfc, 0xa0}, -{0xfc, 0x74, 0xb4}, -{0x88, 0x70, 0x00}, -{0x00, 0x00, 0x00}, +{0x24, 0x91, 0x00}, +{0xb6, 0xb6, 0xb6}, +{0x00, 0x6d, 0x24}, +{0xb6, 0xff, 0x48}, +{0x6d, 0x48, 0xda}, +{0xff, 0xff, 0x00}, +{0xda, 0x6d, 0x00}, +{0x00, 0x48, 0x00}, +{0x00, 0x6d, 0xda}, +{0x00, 0x91, 0x00}, +{0x24, 0x24, 0x24}, +{0xff, 0xff, 0x6d}, +{0xff, 0x6d, 0xff}, +{0x91, 0x6d, 0x00}, +{0x91, 0xff, 0x6d}, diff --git a/source/fceultra/palettes/rp2c04002.h b/source/fceultra/palettes/rp2c04002.h index a6e448c..a66f9ee 100644 --- a/source/fceultra/palettes/rp2c04002.h +++ b/source/fceultra/palettes/rp2c04002.h @@ -1,64 +1,64 @@ {0x00, 0x00, 0x00}, -{0xfc, 0x98, 0x38}, -{0x88, 0x70, 0x00}, +{0xff, 0xb6, 0x00}, +{0x91, 0x6d, 0x00}, +{0xb6, 0xff, 0x48}, +{0x91, 0xff, 0x6d}, +{0xff, 0x6d, 0xff}, +{0x00, 0x91, 0x91}, +{0xb6, 0xda, 0xff}, +{0xff, 0x00, 0x00}, +{0x91, 0x00, 0xff}, +{0xff, 0xff, 0x6d}, +{0xff, 0x91, 0xff}, +{0xff, 0xff, 0xff}, +{0xda, 0x6d, 0xff}, +{0x91, 0xda, 0xff}, +{0x00, 0x91, 0x00}, +{0x00, 0x48, 0x00}, +{0x6d, 0xb6, 0xff}, +{0xb6, 0x24, 0x00}, +{0xda, 0xda, 0xda}, +{0x00, 0xb6, 0x6d}, +{0x6d, 0xda, 0x00}, +{0x48, 0x00, 0x00}, +{0x91, 0x91, 0xff}, +{0x48, 0x48, 0x48}, +{0xff, 0x00, 0xff}, +{0x00, 0x00, 0x6d}, +{0x48, 0xff, 0xda}, +{0xda, 0xb6, 0xff}, +{0x6d, 0x48, 0x00}, {0x00, 0x00, 0x00}, -{0xa8, 0xf0, 0xbc}, -{0xfc, 0x74, 0xb4}, +{0x6d, 0x48, 0xda}, +{0x91, 0x00, 0x6d}, +{0xff, 0xda, 0x91}, +{0xff, 0x91, 0x00}, +{0xff, 0xb6, 0xff}, +{0x00, 0x6d, 0xda}, +{0x6d, 0x24, 0x00}, +{0xb6, 0xb6, 0xb6}, +{0x00, 0x00, 0xda}, +{0xb6, 0x00, 0xff}, +{0xff, 0xda, 0x00}, +{0x6d, 0x6d, 0x6d}, +{0x24, 0x48, 0x00}, +{0x00, 0x48, 0xff}, {0x00, 0x00, 0x00}, -{0xa8, 0xe4, 0xfc}, -{0xd8, 0x28, 0x00}, -{0x80, 0x00, 0xf0}, -{0xfc, 0xe4, 0xa0}, -{0xfc, 0xc4, 0xfc}, -{0xfc, 0xfc, 0xfc}, -{0x40, 0x88, 0xfc}, +{0xda, 0xda, 0x00}, +{0xff, 0xff, 0xff}, +{0xda, 0xb6, 0x6d}, +{0x24, 0x24, 0x24}, +{0x00, 0xff, 0x00}, +{0xda, 0x6d, 0x00}, +{0x00, 0x48, 0x48}, +{0x00, 0x24, 0x91}, +{0xff, 0x00, 0x91}, +{0x24, 0x91, 0x00}, {0x00, 0x00, 0x00}, -{0x00, 0x3c, 0x14}, -{0x00, 0x00, 0x00}, -{0x3c, 0xbc, 0xfc}, -{0xa4, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x90, 0x38}, -{0x80, 0xd0, 0x10}, -{0x00, 0x00, 0x00}, -{0x5c, 0x94, 0xfc}, -{0x00, 0x00, 0x00}, -{0xf4, 0x78, 0xfc}, -{0x00, 0x00, 0x00}, -{0x58, 0xf8, 0x98}, -{0x00, 0x00, 0x00}, -{0x40, 0x2c, 0x00}, -{0x00, 0x00, 0x00}, -{0x44, 0x00, 0x9c}, -{0x00, 0x00, 0x00}, -{0xfc, 0xbc, 0xb0}, -{0xfc, 0x74, 0x60}, -{0xd4, 0xc8, 0xfc}, -{0x00, 0x70, 0xec}, -{0x00, 0x00, 0x00}, -{0xbc, 0xbc, 0xbc}, -{0x00, 0x00, 0xa8}, -{0xbc, 0x00, 0xbc}, -{0x00, 0x00, 0x00}, -{0x74, 0x74, 0x74}, -{0x00, 0x44, 0x00}, -{0x20, 0x38, 0xec}, -{0x00, 0x00, 0x00}, -{0xfc, 0xd8, 0xa8}, -{0xfc, 0xfc, 0xfc}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x4c, 0xdc, 0x48}, -{0xc8, 0x4c, 0x0c}, -{0x18, 0x3c, 0x5c}, -{0x24, 0x18, 0x8c}, -{0xe4, 0x00, 0x58}, -{0x00, 0x94, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0xe8, 0xd8}, -{0x7c, 0x08, 0x00}, -{0xfc, 0xd8, 0xa8}, -{0x00, 0x00, 0x00}, -{0xa8, 0x00, 0x10}, -{0x00, 0x50, 0x00}, -{0x74, 0x74, 0x74}, +{0x00, 0xff, 0xff}, +{0x91, 0x48, 0x00}, +{0xff, 0xff, 0x00}, +{0xff, 0xb6, 0xb6}, +{0xb6, 0x00, 0x6d}, +{0x00, 0x6d, 0x24}, +{0x91, 0x91, 0x91}, diff --git a/source/fceultra/palettes/rp2c04003.h b/source/fceultra/palettes/rp2c04003.h index 7117087..9483fbd 100644 --- a/source/fceultra/palettes/rp2c04003.h +++ b/source/fceultra/palettes/rp2c04003.h @@ -1,64 +1,64 @@ -{0x44, 0x00, 0x9c}, +{0xb6, 0x00, 0xff}, +{0xff, 0x6d, 0xff}, +{0x91, 0xff, 0x6d}, +{0xb6, 0xb6, 0xb6}, +{0x00, 0x91, 0x00}, +{0xff, 0xff, 0xff}, +{0xb6, 0xda, 0xff}, +{0x24, 0x48, 0x00}, +{0x00, 0x24, 0x91}, {0x00, 0x00, 0x00}, +{0xff, 0xda, 0x91}, +{0x6d, 0x48, 0x00}, +{0xff, 0x00, 0x91}, +{0xda, 0xda, 0xda}, +{0xda, 0xb6, 0x6d}, +{0x91, 0xda, 0xff}, +{0x91, 0x91, 0xff}, +{0x00, 0x91, 0x91}, +{0xb6, 0x00, 0x6d}, +{0x00, 0x48, 0xff}, +{0x24, 0x91, 0x00}, +{0x91, 0x6d, 0x00}, +{0xda, 0x6d, 0x00}, +{0x00, 0xb6, 0x6d}, +{0x6d, 0x6d, 0x6d}, +{0x6d, 0x48, 0xda}, {0x00, 0x00, 0x00}, -{0x74, 0x74, 0x74}, -{0x00, 0xa8, 0x00}, -{0xfc, 0xfc, 0xfc}, -{0xa8, 0xe4, 0xfc}, -{0x00, 0x44, 0x00}, -{0x24, 0x18, 0x8c}, +{0x00, 0x00, 0xda}, +{0xff, 0x00, 0x00}, +{0xb6, 0x24, 0x00}, +{0xff, 0x91, 0xff}, +{0xff, 0xb6, 0xb6}, +{0xda, 0x6d, 0xff}, +{0x00, 0x48, 0x00}, +{0x00, 0x00, 0x6d}, +{0xff, 0xff, 0x00}, +{0x24, 0x24, 0x24}, +{0xff, 0xb6, 0x00}, +{0xff, 0x91, 0x00}, +{0xff, 0xff, 0xff}, +{0x6d, 0xda, 0x00}, +{0x91, 0x00, 0x6d}, +{0x6d, 0xb6, 0xff}, +{0xff, 0x00, 0xff}, +{0x00, 0x6d, 0xda}, +{0x91, 0x91, 0x91}, {0x00, 0x00, 0x00}, -{0xfc, 0xbc, 0xb0}, -{0x40, 0x2c, 0x00}, -{0xe4, 0x00, 0x58}, +{0x6d, 0x24, 0x00}, +{0x00, 0xff, 0xff}, +{0x48, 0x00, 0x00}, +{0xb6, 0xff, 0x48}, +{0xff, 0xb6, 0xff}, +{0x91, 0x48, 0x00}, +{0x00, 0xff, 0x00}, +{0xda, 0xda, 0x00}, +{0x48, 0x48, 0x48}, +{0x00, 0x6d, 0x24}, {0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0xfc, 0xfc}, -{0x5c, 0x94, 0xfc}, -{0x00, 0x80, 0x88}, -{0x00, 0x00, 0x00}, -{0x20, 0x38, 0xec}, -{0x00, 0x94, 0x00}, -{0x88, 0x70, 0x00}, -{0xc8, 0x4c, 0x0c}, -{0x00, 0x90, 0x38}, -{0x74, 0x74, 0x74}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0xa8}, -{0xd8, 0x28, 0x00}, -{0xa4, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0xc4, 0xd8}, -{0x40, 0x88, 0xfc}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0xd8, 0xa8}, -{0x00, 0x00, 0x00}, -{0xfc, 0x98, 0x38}, -{0xfc, 0x74, 0x60}, -{0xfc, 0xfc, 0xfc}, -{0x80, 0xd0, 0x10}, -{0x00, 0x00, 0x00}, -{0x3c, 0xbc, 0xfc}, -{0xf4, 0x78, 0xfc}, -{0x00, 0x70, 0xec}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0xe8, 0xd8}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x7c, 0x08, 0x00}, -{0x4c, 0xdc, 0x48}, -{0xf0, 0xbc, 0x3c}, -{0x00, 0x00, 0x00}, -{0x00, 0x50, 0x00}, -{0x00, 0x00, 0x00}, -{0xc4, 0xd4, 0xfc}, -{0xfc, 0xd8, 0xa8}, -{0x80, 0x00, 0xf0}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x18, 0x3c, 0x5c}, +{0xda, 0xb6, 0xff}, +{0xff, 0xff, 0x6d}, +{0x91, 0x00, 0xff}, +{0x48, 0xff, 0xda}, +{0xff, 0xda, 0x00}, +{0x00, 0x48, 0x48}, diff --git a/source/fceultra/palettes/rp2c05004.h b/source/fceultra/palettes/rp2c05004.h index a50ed70..7dc2295 100644 --- a/source/fceultra/palettes/rp2c05004.h +++ b/source/fceultra/palettes/rp2c05004.h @@ -1,64 +1,64 @@ -{0x88, 0x70, 0x00}, +{0x91, 0x6d, 0x00}, +{0x6d, 0x48, 0xda}, +{0x00, 0x91, 0x91}, +{0xda, 0xda, 0x00}, {0x00, 0x00, 0x00}, -{0x00, 0x80, 0x88}, -{0xf0, 0xbc, 0x3c}, +{0xff, 0xb6, 0xb6}, +{0x00, 0x24, 0x91}, +{0xda, 0x6d, 0x00}, +{0xb6, 0xb6, 0xb6}, +{0x6d, 0x24, 0x00}, +{0x00, 0xff, 0x00}, +{0x00, 0x00, 0x6d}, +{0xff, 0xda, 0x91}, +{0xff, 0xff, 0x00}, +{0x00, 0x91, 0x00}, +{0xb6, 0xff, 0x48}, +{0xff, 0x6d, 0xff}, +{0x48, 0x00, 0x00}, +{0x00, 0x48, 0xff}, +{0xff, 0x91, 0xff}, {0x00, 0x00, 0x00}, +{0x48, 0x48, 0x48}, +{0xb6, 0x24, 0x00}, +{0xff, 0x91, 0x00}, +{0xda, 0xb6, 0x6d}, +{0x00, 0xb6, 0x6d}, +{0x91, 0x91, 0xff}, +{0x24, 0x91, 0x00}, +{0x91, 0x00, 0x6d}, {0x00, 0x00, 0x00}, -{0x24, 0x18, 0x8c}, -{0xc8, 0x4c, 0x0c}, -{0xbc, 0xbc, 0xbc}, +{0x91, 0xff, 0x6d}, +{0x6d, 0xb6, 0xff}, +{0xb6, 0x00, 0x6d}, +{0x00, 0x6d, 0x24}, +{0x91, 0x48, 0x00}, +{0x00, 0x00, 0xda}, +{0x91, 0x00, 0xff}, +{0xb6, 0x00, 0xff}, +{0x6d, 0x6d, 0x6d}, +{0xff, 0x00, 0x91}, +{0x00, 0x48, 0x48}, +{0xda, 0xda, 0xda}, +{0x00, 0x6d, 0xda}, +{0x00, 0x48, 0x00}, +{0x24, 0x24, 0x24}, +{0xff, 0xff, 0x6d}, +{0x91, 0x91, 0x91}, +{0xff, 0x00, 0xff}, +{0xff, 0xb6, 0xff}, +{0xff, 0xff, 0xff}, +{0x6d, 0x48, 0x00}, +{0xff, 0x00, 0x00}, +{0xff, 0xda, 0x00}, +{0x48, 0xff, 0xda}, +{0xff, 0xff, 0xff}, +{0x91, 0xda, 0xff}, {0x00, 0x00, 0x00}, -{0x4c, 0xdc, 0x48}, -{0x00, 0x00, 0x00}, -{0xfc, 0xbc, 0xb0}, -{0xfc, 0xd8, 0xa8}, -{0x00, 0xa8, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0x74, 0xb4}, -{0x00, 0x00, 0x00}, -{0x20, 0x38, 0xec}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0x74, 0x60}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x5c, 0x94, 0xfc}, -{0x00, 0x94, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xa8, 0xf0, 0xbc}, -{0x3c, 0xbc, 0xfc}, -{0xa8, 0x00, 0x10}, -{0x00, 0x50, 0x00}, -{0x7c, 0x08, 0x00}, -{0x00, 0x00, 0xa8}, -{0x80, 0x00, 0xf0}, -{0x00, 0x00, 0x00}, -{0x74, 0x74, 0x74}, -{0xe4, 0x00, 0x58}, -{0x18, 0x3c, 0x5c}, -{0x00, 0x00, 0x00}, -{0x00, 0x70, 0xec}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0xe4, 0xa0}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0x40, 0x2c, 0x00}, -{0xd8, 0x28, 0x00}, -{0x00, 0x00, 0x00}, -{0x00, 0x00, 0x00}, -{0xfc, 0xfc, 0xfc}, -{0x9c, 0xfc, 0xf0}, -{0x00, 0x00, 0x00}, -{0xfc, 0x98, 0x38}, -{0x00, 0x00, 0x00}, -{0xa8, 0xe4, 0xfc}, -{0x80, 0xd0, 0x10}, -{0x00, 0x00, 0x00}, -{0xfc, 0xfc, 0xfc}, -{0x00, 0x44, 0x00}, +{0xff, 0xb6, 0x00}, +{0xda, 0x6d, 0xff}, +{0xb6, 0xda, 0xff}, +{0x6d, 0xda, 0x00}, +{0xda, 0xb6, 0xff}, +{0x00, 0xff, 0xff}, +{0x24, 0x48, 0x00}, diff --git a/source/gcvideo.cpp b/source/gcvideo.cpp index 9ab1e87..8dea400 100644 --- a/source/gcvideo.cpp +++ b/source/gcvideo.cpp @@ -1303,99 +1303,131 @@ void SetPalette() } struct st_palettes palettes[] = { - // Unsaturated-V5 Palette By FirebrandX - { "accurate", "Accurate Colors", - { 0x6b6b6b, 0x001e87, 0x1f0b96, 0x3b0c87, - 0x590d61, 0x5e0528, 0x551100, 0x461b00, - 0x303200, 0x0a4800, 0x004e00, 0x004619, - 0x00395a, 0x000000, 0x000000, 0x000000, - 0xb2b2b2, 0x1a53d1, 0x4835ee, 0x7123ec, - 0x9a1eb7, 0xa51e62, 0xa52d19, 0x874b00, - 0x676900, 0x298400, 0x038b00, 0x008240, - 0x007096, 0x000000, 0x000000, 0x000000, - 0xffffff, 0x63adfd, 0x908afe, 0xb977fc, - 0xe771fe, 0xf76fc9, 0xf5836a, 0xdd9c29, - 0xbdb807, 0x84d107, 0x5bdc3b, 0x48d77d, - 0x48c6d8, 0x555555, 0x000000, 0x000000, - 0xffffff, 0xc4e3fe, 0xd7d5fe, 0xe6cdfe, - 0xf9cafe, 0xfec9f0, 0xfed1c7, 0xf7dcac, - 0xe8e89c, 0xd1f29d, 0xbff4b1, 0xb7f5cd, - 0xb7ebf2, 0xbebebe, 0x000000, 0x000000 } + { "smooth-fbx", "Smooth (FBX)", + { 0x6A6D6A, 0x001380, 0x1E008A, 0x39007A, + 0x550056, 0x5A0018, 0x4F1000, 0x3D1C00, + 0x253200, 0x003D00, 0x004000, 0x003924, + 0x002E55, 0x000000, 0x000000, 0x000000, + 0xB9BCB9, 0x1850C7, 0x4B30E3, 0x7322D6, + 0x951FA9, 0x9D285C, 0x983700, 0x7F4C00, + 0x5E6400, 0x227700, 0x027E02, 0x007645, + 0x006E8A, 0x000000, 0x000000, 0x000000, + 0xFFFFFF, 0x68A6FF, 0x8C9CFF, 0xB586FF, + 0xD975FD, 0xE377B9, 0xE58D68, 0xD49D29, + 0xB3AF0C, 0x7BC211, 0x55CA47, 0x46CB81, + 0x47C1C5, 0x4A4D4A, 0x000000, 0x000000, + 0xFFFFFF, 0xCCEAFF, 0xDDDEFF, 0xECDAFF, + 0xF8D7FE, 0xFCD6F5, 0xFDDBCF, 0xF9E7B5, + 0xF1F0AA, 0xDAFAA9, 0xC9FFBC, 0xC3FBD7, + 0xC4F6F6, 0xBEC1BE, 0x000000, 0x000000 } }, - // YUV-V3 Palette By FirebrandX - { "vivid", "Vivid Colors", - { 0x666666, 0x002a88, 0x1412a7, 0x3b00a4, - 0x5c007e, 0x6e0040, 0x6c0700, 0x561d00, - 0x333500, 0x0c4800, 0x005200, 0x004c18, - 0x003e5b, 0x000000, 0x000000, 0x000000, - 0xadadad, 0x155fd9, 0x4240ff, 0x7527fe, - 0xa01acc, 0xb71e7b, 0xb53120, 0x994e00, - 0x6b6d00, 0x388700, 0x0d9300, 0x008c47, - 0x007aa0, 0x000000, 0x000000, 0x000000, - 0xffffff, 0x64b0ff, 0x9290ff, 0xc676ff, - 0xf26aff, 0xff6ecc, 0xff8170, 0xea9e22, - 0xbcbe00, 0x88d800, 0x5ce430, 0x45e082, - 0x48cdde, 0x4f4f4f, 0x000000, 0x000000, - 0xffffff, 0xc0dfff, 0xd3d2ff, 0xe8c8ff, - 0xfac2ff, 0xffc4ea, 0xffccc5, 0xf7d8a5, - 0xe4e594, 0xcfef96, 0xbdf4ab, 0xb3f3cc, - 0xb5ebf2, 0xb8b8b8, 0x000000, 0x000000 } + { "pvm-style-d93-fbx", "PVM Style D93 (FBX)", + { 0x696B63, 0x001774, 0x1E0087, 0x340073, + 0x560057, 0x5E0013, 0x531A00, 0x3B2400, + 0x243000, 0x063A00, 0x003F00, 0x003B1E, + 0x00334E, 0x000000, 0x000000, 0x000000, + 0xB9BBB3, 0x1453B9, 0x4D2CDA, 0x671EDE, + 0x98189C, 0x9D2344, 0xA03E00, 0x8D5500, + 0x656D00, 0x2C7900, 0x008100, 0x007D42, + 0x00788A, 0x000000, 0x000000, 0x000000, + 0xFFFFFF, 0x69A8FF, 0x9691FF, 0xB28AFA, + 0xEA7DFA, 0xF37BC7, 0xF28E59, 0xE6AD27, + 0xD7C805, 0x90DF07, 0x64E53C, 0x45E27D, + 0x48D5D9, 0x4E5048, 0x000000, 0x000000, + 0xFFFFFF, 0xD2EAFF, 0xE2E2FF, 0xE9D8FF, + 0xF5D2FF, 0xF8D9EA, 0xFADEB9, 0xF9E89B, + 0xF3F28C, 0xD3FA91, 0xB8FCA8, 0xAEFACA, + 0xCAF3F3, 0xBEC0B8, 0x000000, 0x000000 } }, - // Wii Virtual Console palette by SuperrSonic's - { "wiivc", "Wii VC Colors", - { 0x494949, 0x00006a, 0x090063, 0x290059, - 0x42004a, 0x490000, 0x420000, 0x291100, - 0x182700, 0x003010, 0x003000, 0x002910, - 0x012043, 0x000000, 0x000000, 0x000000, - 0x747174, 0x003084, 0x3101ac, 0x4b0194, - 0x64007b, 0x6b0039, 0x6b2101, 0x5a2f00, - 0x424900, 0x185901, 0x105901, 0x015932, - 0x01495a, 0x101010, 0x000000, 0x000000, - 0xadadad, 0x4a71b6, 0x6458d5, 0x8450e6, - 0xa451ad, 0xad4984, 0xb5624a, 0x947132, - 0x7b722a, 0x5a8601, 0x388e31, 0x318e5a, - 0x398e8d, 0x383838, 0x000000, 0x000000, - 0xb6b6b6, 0x8c9db5, 0x8d8eae, 0x9c8ebc, - 0xa687bc, 0xad8d9d, 0xae968c, 0x9c8f7c, - 0x9c9e72, 0x94a67c, 0x84a77b, 0x7c9d84, - 0x73968d, 0xdedede, 0x000000, 0x000000 } + { "composite-direct-fbx", "Composite Direct (FBX)", + { 0x656565, 0x00127D, 0x18008E, 0x360082, + 0x56005D, 0x5A0018, 0x4F0500, 0x381900, + 0x1D3100, 0x003D00, 0x004100, 0x003B17, + 0x002E55, 0x000000, 0x000000, 0x000000, + 0xAFAFAF, 0x194EC8, 0x472FE3, 0x6B1FD7, + 0x931BAE, 0x9E1A5E, 0x993200, 0x7B4B00, + 0x5B6700, 0x267A00, 0x008200, 0x007A3E, + 0x006E8A, 0x000000, 0x000000, 0x000000, + 0xFFFFFF, 0x64A9FF, 0x8E89FF, 0xB676FF, + 0xE06FFF, 0xEF6CC4, 0xF0806A, 0xD8982C, + 0xB9B40A, 0x83CB0C, 0x5BD63F, 0x4AD17E, + 0x4DC7CB, 0x4C4C4C, 0x000000, 0x000000, + 0xFFFFFF, 0xC7E5FF, 0xD9D9FF, 0xE9D1FF, + 0xF9CEFF, 0xFFCCF1, 0xFFD4CB, 0xF8DFB1, + 0xEDEAA4, 0xD6F4A4, 0xC5F8B8, 0xBEF6D3, + 0xBFF1F1, 0xB9B9B9, 0x000000, 0x000000 } + }, + { "nes-classic-fbx-fs", "NES Classic (FBX-FS)", + { 0x60615F, 0x000083, 0x1D0195, 0x340875, + 0x51055E, 0x56000F, 0x4C0700, 0x372308, + 0x203A0B, 0x0F4B0E, 0x194C16, 0x02421E, + 0x023154, 0x000000, 0x000000, 0x000000, + 0xA9AAA8, 0x104BBF, 0x4712D8, 0x6300CA, + 0x8800A9, 0x930B46, 0x8A2D04, 0x6F5206, + 0x5C7114, 0x1B8D12, 0x199509, 0x178448, + 0x206B8E, 0x000000, 0x000000, 0x000000, + 0xFBFBFB, 0x6699F8, 0x8974F9, 0xAB58F8, + 0xD557EF, 0xDE5FA9, 0xDC7F59, 0xC7A224, + 0xA7BE03, 0x75D703, 0x60E34F, 0x3CD68D, + 0x56C9CC, 0x414240, 0x000000, 0x000000, + 0xFBFBFB, 0xBED4FA, 0xC9C7F9, 0xD7BEFA, + 0xE8B8F9, 0xF5BAE5, 0xF3CAC2, 0xDFCDA7, + 0xD9E09C, 0xC9EB9E, 0xC0EDB8, 0xB5F4C7, + 0xB9EAE9, 0xABABAB, 0x000000, 0x000000 } + }, + { "rgb", "PC-10", + { 0x6D6D6D, 0x002492, 0x0000DB, 0x6D49DB, + 0x92006D, 0xB6006D, 0xB62400, 0x924900, + 0x6D4900, 0x244900, 0x006D24, 0x009200, + 0x004949, 0x000000, 0x000000, 0x000000, + 0xB6B6B6, 0x006DDB, 0x0049FF, 0x9200FF, + 0xB600FF, 0xFF0092, 0xFF0000, 0xDB6D00, + 0x926D00, 0x249200, 0x009200, 0x00B66D, + 0x009292, 0x242424, 0x000000, 0x000000, + 0xFFFFFF, 0x6DB6FF, 0x9292FF, 0xDB6DFF, + 0xFF00FF, 0xFF6DFF, 0xFF9200, 0xFFB600, + 0xDBDB00, 0x6DDB00, 0x00FF00, 0x49FFDB, + 0x00FFFF, 0x494949, 0x000000, 0x000000, + 0xFFFFFF, 0xB6DBFF, 0xDBB6FF, 0xFFB6FF, + 0xFF92FF, 0xFFB6B6, 0xFFDB92, 0xFFFF49, + 0xFFFF6D, 0xB6FF49, 0x92FF6D, 0x49FFDB, + 0x92DBFF, 0x929292, 0x000000, 0x000000 } }, - // 3DS Virtual Console palette by SuperrSonic's - { "3dsvc", "3DS VC Colors", - { 0x494949, 0x00006a, 0x090063, 0x290059, - 0x42004a, 0x490000, 0x420000, 0x291100, - 0x182700, 0x003010, 0x003000, 0x002910, - 0x012043, 0x000000, 0x000000, 0x000000, - 0x747174, 0x003084, 0x3101ac, 0x4b0194, - 0x64007b, 0x6b0039, 0x6b2101, 0x5a2f00, - 0x424900, 0x185901, 0x105901, 0x015932, - 0x01495a, 0x101010, 0x000000, 0x000000, - 0xadadad, 0x4a71b6, 0x6458d5, 0x8450e6, - 0xa451ad, 0xad4984, 0xb5624a, 0x947132, - 0x7b722a, 0x5a8601, 0x388e31, 0x318e5a, - 0x398e8d, 0x383838, 0x000000, 0x000000, - 0xb6b6b6, 0x8c9db5, 0x8d8eae, 0x9c8ebc, - 0xa687bc, 0xad8d9d, 0xae968c, 0x9c8f7c, - 0x9c9e72, 0x94a67c, 0x84a77b, 0x7c9d84, - 0x73968d, 0xdedede, 0x000000, 0x000000 } - }, - { "asqrealc", "FCEUGX Colors", - { 0x6c6c6c, 0x00268e, 0x0000a8, 0x400094, - 0x700070, 0x780040, 0x700000, 0x621600, - 0x442400, 0x343400, 0x005000, 0x004444, - 0x004060, 0x000000, 0x101010, 0x101010, - 0xbababa, 0x205cdc, 0x3838ff, 0x8020f0, - 0xc000c0, 0xd01474, 0xd02020, 0xac4014, - 0x7c5400, 0x586400, 0x008800, 0x007468, - 0x00749c, 0x202020, 0x101010, 0x101010, - 0xffffff, 0x4ca0ff, 0x8888ff, 0xc06cff, - 0xff50ff, 0xff64b8, 0xff7878, 0xff9638, - 0xdbab00, 0xa2ca20, 0x4adc4a, 0x2ccca4, - 0x1cc2ea, 0x585858, 0x101010, 0x101010, - 0xffffff, 0xb0d4ff, 0xc4c4ff, 0xe8b8ff, - 0xffb0ff, 0xffb8e8, 0xffc4c4, 0xffd4a8, - 0xffe890, 0xf0f4a4, 0xc0ffc0, 0xacf4f0, - 0xa0e8ff, 0xc2c2c2, 0x202020, 0x101010 } + { "sony-cxa2025as-us", "Sony CXA", + { 0x585858, 0x00238C, 0x00139B, 0x2D0585, + 0x5D0052, 0x7A0017, 0x7A0800, 0x5F1800, + 0x352A00, 0x093900, 0x003F00, 0x003C22, + 0x00325D, 0x000000, 0x000000, 0x000000, + 0xA1A1A1, 0x0053EE, 0x153CFE, 0x6028E4, + 0xA91D98, 0xD41E41, 0xD22C00, 0xAA4400, + 0x6C5E00, 0x2D7300, 0x007D06, 0x007852, + 0x0069A9, 0x000000, 0x000000, 0x000000, + 0xFFFFFF, 0x1FA5FE, 0x5E89FE, 0xB572FE, + 0xFE65F6, 0xFE6790, 0xFE773C, 0xFE9308, + 0xC4B200, 0x79CA10, 0x3AD54A, 0x11D1A4, + 0x06BFFE, 0x424242, 0x000000, 0x000000, + 0xFFFFFF, 0xA0D9FE, 0xBDCCFE, 0xE1C2FE, + 0xFEBCFB, 0xFEBDD0, 0xFEC5A9, 0xFED18E, + 0xE9DE86, 0xC7E992, 0xA8EEB0, 0x95ECD9, + 0x91E4FE, 0xACACAC, 0x000000, 0x000000 } + }, + { "wavebeam", "Wavebeam", + { 0x6B6B6B, 0x001B88, 0x21009A, 0x40008C, + 0x600067, 0x64001E, 0x590800, 0x481600, + 0x283600, 0x004500, 0x004908, 0x00421D, + 0x003659, 0x000000, 0x000000, 0x000000, + 0xB4B4B4, 0x1555D3, 0x4337EF, 0x7425DF, + 0x9C19B9, 0xAC0F64, 0xAA2C00, 0x8A4B00, + 0x666B00, 0x218300, 0x008A00, 0x008144, + 0x007691, 0x000000, 0x000000, 0x000000, + 0xFFFFFF, 0x63B2FF, 0x7C9CFF, 0xC07DFE, + 0xE977FF, 0xF572CD, 0xF4886B, 0xDDA029, + 0xBDBD0A, 0x89D20E, 0x5CDE3E, 0x4BD886, + 0x4DCFD2, 0x525252, 0x000000, 0x000000, + 0xFFFFFF, 0xBCDFFF, 0xD2D2FF, 0xE1C8FF, + 0xEFC7FF, 0xFFC3E1, 0xFFCAC6, 0xF2DAAD, + 0xEBE3A0, 0xD2EDA2, 0xBCF4B4, 0xB5F1CE, + 0xB6ECF1, 0xBFBFBF, 0x000000, 0x000000 } } }; diff --git a/source/gcvideo.h b/source/gcvideo.h index 0b23999..1d1b655 100644 --- a/source/gcvideo.h +++ b/source/gcvideo.h @@ -13,7 +13,7 @@ #define _GCVIDEO_H_ // color palettes -#define MAXPAL 5 +#define MAXPAL 7 struct st_palettes { char name[32], desc[32]; diff --git a/source/menu.cpp b/source/menu.cpp index 8d3b6b8..71323a1 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -3202,7 +3202,7 @@ static int MenuSettingsVideo() } sprintf (options.value[3], "%s", - GCSettings.currpal ? palettes[GCSettings.currpal-1].desc : "Default Colors"); + GCSettings.currpal ? palettes[GCSettings.currpal-1].desc : "Default"); switch(GCSettings.timing) {