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

[dreammaster]

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:
aa06fef90d MM: MM1: Corrected palette for monsters 50 to 100


Commit: aa06fef90da4c8ec1064cd5a6a6cc7ec79f14afb
    https://github.com/scummvm/scummvm/commit/aa06fef90da4c8ec1064cd5a6a6cc7ec79f14afb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-25T19:55:38-07:00

Commit Message:
MM: MM1: Corrected palette for monsters 50 to 100

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


diff --git a/engines/mm/mm1/data/monsters.cpp b/engines/mm/mm1/data/monsters.cpp
index c6fa78e0b1a..7c7e4bb33e8 100644
--- a/engines/mm/mm1/data/monsters.cpp
+++ b/engines/mm/mm1/data/monsters.cpp
@@ -29,21 +29,21 @@ namespace MM {
 namespace MM1 {
 
 static const uint16 PALETTE[76] = {
-	0xf470, 0xf420, 0xfe20, 0x0000, 0xf420, 0xf620, 0xf460, 0xf6e0,
+	0xf470, 0xf420, 0xfe20, 0xf630, 0xf420, 0xf620, 0xf460, 0xf6e0,
 	// 8
 	0xf510, 0xfe40, 0xf420, 0xf410, 0xfd50, 0x0000, 0xf430, 0xfc30,
 	// 16
-	0x0000, 0x0000, 0xf420, 0x0000, 0xf420, 0x0000, 0x0000, 0xf4e0,
+	0xf770, 0xfc30, 0xf420, 0xf430, 0xf420, 0x0000, 0xf110, 0xf4e0,
 	// 24
-	0xf430, 0xfd60, 0x0000, 0x0000, 0x0000, 0xf470, 0x0000, 0x0000,
+	0xf430, 0xfd60, 0xf430, 0x0000, 0xf2a0, 0xf470, 0xf4e0, 0xf250,
 	// 32
-	0xf430, 0x0000, 0x0000, 0xf420, 0xf220, 0xf420, 0xfdd0, 0xf420,
+	0xf430, 0xf320, 0xfee0, 0xf420, 0xf220, 0xf420, 0xfdd0, 0xf420,
 	// 40
-	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfa50,
+	0xf620, 0x0000, 0x0000, 0x0000, 0xf420, 0xf220, 0x0000, 0xfa50,
 	// 48
-	0x0000, 0xf620, 0x0000, 0xf420, 0x0000, 0xf4e0, 0x0000, 0xf140,
+	0xfe20, 0xf620, 0xf470, 0xf420, 0xfe10, 0xf4e0, 0xfe40, 0xf140,
 	// 56
-	0x0000, 0x0000, 0xf520, 0x0000, 0xfc10, 0x0000, 0xf420, 0xfe10,
+	0x0000, 0xf410, 0xf520, 0x0000, 0xfc10, 0x0000, 0xf420, 0xfe10,
 	// 64
 	0xf520, 0xf4a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	// 72
diff --git a/engines/mm/mm1/data/monsters.h b/engines/mm/mm1/data/monsters.h
index 28c66a8082b..250a8e7c12a 100644
--- a/engines/mm/mm1/data/monsters.h
+++ b/engines/mm/mm1/data/monsters.h
@@ -131,7 +131,7 @@ public:
 	/**
 	 * Get a monster image
 	 */
-	Graphics::ManagedSurface getMonsterImage(int monsterNum);
+	Graphics::ManagedSurface getMonsterImage(int imgNum);
 };
 
 } // namespace MM1