[Scummvm-git-logs] scummvm master -> d6b4e943952141dcf9a5a9e5586f8b8a7f0e3bb3

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d6b4e94395 SCUMM: Change NES Palette Used for Maniac Mansion to Sony CXA2025AS


Commit: d6b4e943952141dcf9a5a9e5586f8b8a7f0e3bb3
    https://github.com/scummvm/scummvm/commit/d6b4e943952141dcf9a5a9e5586f8b8a7f0e3bb3
Author: D G Turner (digitall at scummvm.org)
Date: 2020-04-29T10:12:44+02:00

Commit Message:
SCUMM: Change NES Palette Used for Maniac Mansion to Sony CXA2025AS

NES games have a 48 color and 6 gray palette, but this does not include
how the colors are mapped to the screen which will vary by system / TV
display. Each NES Emulator has used slightly different values.

These values are submitted as a better mapping for the flesh tones in
Maniac Mansion by the user "LaurentLaSalle" from a forum post.

Changed paths:
    engines/scumm/palette.cpp


diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index aeb40df003..fc19b30bc4 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -72,27 +72,25 @@ void ScummEngine::resetPalette() {
 	};
 
 	static const byte tableNESPalette[] = {
-		/*    0x1D     */
-		0x24, 0x24, 0x24, 	0x00, 0x24, 0x92, 	0x00, 0x00, 0xDB, 	0x6D, 0x49, 0xDB,
-		0x92, 0x00, 0x6D, 	0xB6, 0x00, 0x6D, 	0xB6, 0x24, 0x00, 	0x92, 0x49, 0x00,
-		0x6D, 0x49, 0x00, 	0x24, 0x49, 0x00, 	0x00, 0x6D, 0x24, 	0x00, 0x92, 0x00,
-		0x00, 0x49, 0x49, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
-
-		0xB6, 0xB6, 0xB6, 	0x00, 0x6D, 0xDB, 	0x00, 0x49, 0xFF, 	0x92, 0x00, 0xFF,
-		0xB6, 0x00, 0xFF, 	0xFF, 0x00, 0x92, 	0xFF, 0x00, 0x00, 	0xDB, 0x6D, 0x00,
-		0x92, 0x6D, 0x00, 	0x24, 0x92, 0x00, 	0x00, 0x92, 0x00, 	0x00, 0xB6, 0x6D,
-							/*    0x00     */
-		0x00, 0x92, 0x92, 	0x6D, 0x6D, 0x6D, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
-
-		0xFF, 0xFF, 0xFF, 	0x6D, 0xB6, 0xFF, 	0x92, 0x92, 0xFF, 	0xDB, 0x6D, 0xFF,
-		0xFF, 0x00, 0xFF, 	0xFF, 0x6D, 0xFF, 	0xFF, 0x92, 0x00, 	0xFF, 0xB6, 0x00,
-		0xDB, 0xDB, 0x00, 	0x6D, 0xDB, 0x00, 	0x00, 0xFF, 0x00, 	0x49, 0xFF, 0xDB,
-		0x00, 0xFF, 0xFF, 	0x49, 0x49, 0x49, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
-
-		0xFF, 0xFF, 0xFF, 	0xB6, 0xDB, 0xFF, 	0xDB, 0xB6, 0xFF, 	0xFF, 0xB6, 0xFF,
-		0xFF, 0x92, 0xFF, 	0xFF, 0xB6, 0xB6, 	0xFF, 0xDB, 0x92, 	0xFF, 0xFF, 0x49,
-		0xFF, 0xFF, 0x6D, 	0xB6, 0xFF, 0x49, 	0x92, 0xFF, 0x6D, 	0x49, 0xFF, 0xDB,
-		0x92, 0xDB, 0xFF, 	0x92, 0x92, 0x92, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00
+		0x00, 0x00, 0x00, 	0x00, 0x23, 0x8C, 	0x00, 0x13, 0x9B, 	0x2D, 0x05, 0x85,
+		0x5D, 0x00, 0x52, 	0x7A, 0x00, 0x17, 	0x7A, 0x08, 0x00, 	0x5F, 0x18, 0x00,
+		0x35, 0x2A, 0x00, 	0x09, 0x39, 0x00, 	0x00, 0x3F, 0x00, 	0x00, 0x3C, 0x22,
+		0x00, 0x32, 0x5D, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
+
+		0xA1, 0xA1, 0xA1, 	0x00, 0x53, 0xEE, 	0x15, 0x3C, 0xFE, 	0x60, 0x28, 0xE4,
+		0xA9, 0x1D, 0x98, 	0xD4, 0x1E, 0x41, 	0xD2, 0x2C, 0x00, 	0xAA, 0x44, 0x00,
+		0x6C, 0x5E, 0x00, 	0x2D, 0x73, 0x00, 	0x00, 0x7D, 0x06, 	0x00, 0x78, 0x52,
+		0x00, 0x69, 0xA9, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
+
+		0xFF, 0xFF, 0xFF, 	0x1F, 0xA5, 0xFE, 	0x5E, 0x89, 0xFE, 	0xB5, 0x72, 0xFE,
+		0xFE, 0x65, 0xF6, 	0xFE, 0x67, 0x90, 	0xFE, 0x77, 0x3C, 	0xFE, 0x93, 0x08,
+		0xC4, 0xB2, 0x00, 	0x79, 0xCA, 0x10, 	0x3A, 0xD5, 0x4A, 	0x11, 0xD1, 0xA4,
+		0x06, 0xBF, 0xFE, 	0x42, 0x42, 0x42, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
+
+		0xFF, 0xFF, 0xFF, 	0xA0, 0xD9, 0xFE, 	0xBD, 0xCC, 0xFE, 	0xE1, 0xC2, 0xFE,
+		0xFE, 0xBC, 0xFB, 	0xFE, 0xBD, 0xD0, 	0xFE, 0xC5, 0xA9, 	0xFE, 0xD1, 0x8E,
+		0xE9, 0xDE, 0x86, 	0xC7, 0xE9, 0x92, 	0xA8, 0xEE, 0xB0, 	0x95, 0xEC, 0xD9,
+		0x91, 0xE4, 0xFE, 	0xAC, 0xAC, 0xAC, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00
 	};
 
 	static const byte tableAmigaPalette[] = {