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

[dreammaster]

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

Summary:
3fae7cc7e1 MM: MM1: Fix palettes for more monsters
c0dfa3d55b MM: MM1: Fix palette for remaining monsters
d2eaca92ef MM: MM1: Palette fixes for miscellaneous graphics


Commit: 3fae7cc7e13f7fd7c2af7e199a97864bfeb40399
    https://github.com/scummvm/scummvm/commit/3fae7cc7e13f7fd7c2af7e199a97864bfeb40399
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-25T20:53:23-07:00

Commit Message:
MM: MM1: Fix palettes for more monsters

Changed paths:
    engines/mm/mm1/data/monsters.cpp


diff --git a/engines/mm/mm1/data/monsters.cpp b/engines/mm/mm1/data/monsters.cpp
index 7c7e4bb33e8..5253fdb230b 100644
--- a/engines/mm/mm1/data/monsters.cpp
+++ b/engines/mm/mm1/data/monsters.cpp
@@ -31,19 +31,19 @@ namespace MM1 {
 static const uint16 PALETTE[76] = {
 	0xf470, 0xf420, 0xfe20, 0xf630, 0xf420, 0xf620, 0xf460, 0xf6e0,
 	// 8
-	0xf510, 0xfe40, 0xf420, 0xf410, 0xfd50, 0x0000, 0xf430, 0xfc30,
+	0xf510, 0xfe40, 0xf420, 0xf410, 0xfd50, 0xfc90, 0xf430, 0xfc30,
 	// 16
 	0xf770, 0xfc30, 0xf420, 0xf430, 0xf420, 0x0000, 0xf110, 0xf4e0,
 	// 24
-	0xf430, 0xfd60, 0xf430, 0x0000, 0xf2a0, 0xf470, 0xf4e0, 0xf250,
+	0xf430, 0xfd60, 0xf430, 0xfc20, 0xf2a0, 0xf470, 0xf4e0, 0xf250,
 	// 32
 	0xf430, 0xf320, 0xfee0, 0xf420, 0xf220, 0xf420, 0xfdd0, 0xf420,
 	// 40
-	0xf620, 0x0000, 0x0000, 0x0000, 0xf420, 0xf220, 0x0000, 0xfa50,
+	0xf620, 0x0000, 0xfc10, 0x0000, 0xf420, 0xf220, 0xf420, 0xfa50,
 	// 48
 	0xfe20, 0xf620, 0xf470, 0xf420, 0xfe10, 0xf4e0, 0xfe40, 0xf140,
 	// 56
-	0x0000, 0xf410, 0xf520, 0x0000, 0xfc10, 0x0000, 0xf420, 0xfe10,
+	0x0000, 0xf410, 0xf520, 0xf410, 0xfc10, 0xf120, 0xf420, 0xfe10,
 	// 64
 	0xf520, 0xf4a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	// 72


Commit: c0dfa3d55b82067c7df95488875c9cf6865472dc
    https://github.com/scummvm/scummvm/commit/c0dfa3d55b82067c7df95488875c9cf6865472dc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-25T21:51:17-07:00

Commit Message:
MM: MM1: Fix palette for remaining monsters

Changed paths:
    devtools/create_mm/files/mm1/monsters.txt
    engines/mm/mm1/data/monsters.cpp


diff --git a/devtools/create_mm/files/mm1/monsters.txt b/devtools/create_mm/files/mm1/monsters.txt
index 3758ee13347..707055a8999 100644
--- a/devtools/create_mm/files/mm1/monsters.txt
+++ b/devtools/create_mm/files/mm1/monsters.txt
@@ -141,7 +141,7 @@
 "Werephase Mummy", 4, 1, 70, 20, 20, 2, 35, 8000, 1, 50, 255, 9, 0, 0, 240, 61
 "Black Dragon   ", 2, 0, 75, 12, 18, 3, 16, 15000, 127, 30, 255, 135, 29, 70, 163, 41
 "Red Dragon     ", 2, 2, 80, 12, 20, 3, 15, 15000, 127, 30, 255, 141, 30, 70, 163, 41
-"Xx!xx!xx!xx!xx ", 2, 0, 10, 20, 1, 1, 18, 15000, 0, 50, 255, 151, 0, 0, 0, 9
+"XX!XX!XX!XX!XX ", 2, 0, 10, 20, 1, 1, 18, 15000, 0, 50, 255, 151, 0, 0, 0, 9
 "Black Knight   ", 1, 0, 150, 16, 50, 3, 20, 10000, 134, 30, 255, 14, 168, 0, 246, 56
 "Demon Lord     ", 1, 0, 150, 20, 50, 2, 30, 60000, 255, 50, 255, 24, 23, 20, 246, 13
 "Arch Devil     ", 1, 0, 200, 16, 100, 1, 30, 60000, 255, 50, 255, 24, 23, 30, 246, 13
diff --git a/engines/mm/mm1/data/monsters.cpp b/engines/mm/mm1/data/monsters.cpp
index 5253fdb230b..4e8b68b08f8 100644
--- a/engines/mm/mm1/data/monsters.cpp
+++ b/engines/mm/mm1/data/monsters.cpp
@@ -39,15 +39,15 @@ static const uint16 PALETTE[76] = {
 	// 32
 	0xf430, 0xf320, 0xfee0, 0xf420, 0xf220, 0xf420, 0xfdd0, 0xf420,
 	// 40
-	0xf620, 0x0000, 0xfc10, 0x0000, 0xf420, 0xf220, 0xf420, 0xfa50,
+	0xf620, 0xfc20, 0xfc10, 0x0000, 0xf420, 0xf220, 0xf420, 0xfa50,
 	// 48
 	0xfe20, 0xf620, 0xf470, 0xf420, 0xfe10, 0xf4e0, 0xfe40, 0xf140,
 	// 56
-	0x0000, 0xf410, 0xf520, 0xf410, 0xfc10, 0xf120, 0xf420, 0xfe10,
+	0xf290, 0xf410, 0xf520, 0xf410, 0xfc10, 0xf120, 0xf420, 0xfe10,
 	// 64
 	0xf520, 0xf4a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	// 72
-	0x0000, 0x0000, 0x0000, 0xf420
+	0x0000, 0xfc20, 0xfd90, 0xf420
 };
 
 Monsters::Monsters() : _monPix(MONPIX_DTA) {


Commit: d2eaca92ef36c26162c6a6343713225f05a8b55c
    https://github.com/scummvm/scummvm/commit/d2eaca92ef36c26162c6a6343713225f05a8b55c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-25T22:10:25-07:00

Commit Message:
MM: MM1: Palette fixes for miscellaneous graphics

Changed paths:
    engines/mm/mm1/data/monsters.cpp


diff --git a/engines/mm/mm1/data/monsters.cpp b/engines/mm/mm1/data/monsters.cpp
index 4e8b68b08f8..a999b51272d 100644
--- a/engines/mm/mm1/data/monsters.cpp
+++ b/engines/mm/mm1/data/monsters.cpp
@@ -30,24 +30,15 @@ namespace MM1 {
 
 static const uint16 PALETTE[76] = {
 	0xf470, 0xf420, 0xfe20, 0xf630, 0xf420, 0xf620, 0xf460, 0xf6e0,
-	// 8
 	0xf510, 0xfe40, 0xf420, 0xf410, 0xfd50, 0xfc90, 0xf430, 0xfc30,
-	// 16
-	0xf770, 0xfc30, 0xf420, 0xf430, 0xf420, 0x0000, 0xf110, 0xf4e0,
-	// 24
+	0xf770, 0xfc30, 0xf420, 0xf430, 0xf420, 0xf490, 0xf110, 0xf4e0,
 	0xf430, 0xfd60, 0xf430, 0xfc20, 0xf2a0, 0xf470, 0xf4e0, 0xf250,
-	// 32
 	0xf430, 0xf320, 0xfee0, 0xf420, 0xf220, 0xf420, 0xfdd0, 0xf420,
-	// 40
-	0xf620, 0xfc20, 0xfc10, 0x0000, 0xf420, 0xf220, 0xf420, 0xfa50,
-	// 48
+	0xf620, 0xfc20, 0xfc10, 0xf520, 0xf420, 0xf220, 0xf420, 0xfa50,
 	0xfe20, 0xf620, 0xf470, 0xf420, 0xfe10, 0xf4e0, 0xfe40, 0xf140,
-	// 56
 	0xf290, 0xf410, 0xf520, 0xf410, 0xfc10, 0xf120, 0xf420, 0xfe10,
-	// 64
-	0xf520, 0xf4a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	// 72
-	0x0000, 0xfc20, 0xfd90, 0xf420
+	0xf520, 0xf4a0, 0xfe60, 0xfe60, 0xf620, 0xf620, 0xfce0, 0xf420,
+	0xfc20, 0xfc20, 0xfd90, 0xf420
 };
 
 Monsters::Monsters() : _monPix(MONPIX_DTA) {
@@ -97,7 +88,7 @@ Graphics::ManagedSurface Monsters::getMonsterImage(int imgNum) {
 	Graphics::ManagedSurface img;
 	Gfx::ScreenDecoder decoder;
 
-	const uint pal = PALETTE[imgNum];
+	uint pal = PALETTE[imgNum];
 	decoder._indexes[0] = pal & 0xf;
 	decoder._indexes[1] = (pal >> 4) & 0xf;
 	decoder._indexes[2] = (pal >> 8) & 0xf;