From 812ea151bbf84cb45a86212133ad32b3ea1ca01b Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Sun, 16 Apr 2023 16:15:26 +0200
Subject: [PATCH] Fix duplicate RGB colours in palette (#18299)

* Remove duplicate RGB colours from palette

* Update hash

* Update reference dat file

---------

Co-authored-by: Spacek531 <spacek531@comcast.net>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
---
 src/openrct2/drawing/ImageImporter.h    |  14 +++++++-------
 test/tests/ImageImporterTests.cpp       |   2 +-
 test/tests/testdata/sprites/example.dat | Bin 8587 -> 8587 bytes
 test/tests/testdata/sprites/result.dat  | Bin 8 -> 0 bytes
 4 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 test/tests/testdata/sprites/result.dat

diff --git a/src/openrct2/drawing/ImageImporter.h b/src/openrct2/drawing/ImageImporter.h
index 9fb532f4cf..35c43f7126 100644
--- a/src/openrct2/drawing/ImageImporter.h
+++ b/src/openrct2/drawing/ImageImporter.h
@@ -361,18 +361,18 @@ constexpr const GamePalette StandardPalette = { {
     { 0, 255, 255, 255 },
 
     // 230 - 234 (Water waves)
-    { 99, 107, 7, 255 },
-    { 99, 107, 7, 255 },
     { 135, 143, 39, 255 },
     { 123, 131, 27, 255 },
-    { 99, 107, 7, 255 },
+    { 95, 103, 7, 255 },
+    { 87, 95, 0, 255 },
+    { 111, 119, 15, 255 },
 
     // 235 - 249 (Water sparkles)
-    { 151, 155, 55, 255 },
-    { 151, 155, 55, 255 },
+    { 255, 255, 199, 255 },
     { 227, 227, 155, 255 },
-    { 203, 203, 115, 255 },
-    { 151, 155, 55, 255 },
+    { 175, 175, 83, 255 },
+    { 151, 155, 51, 255 },
+    { 203, 203, 123, 255 },
 
     // 240 - 242 (Extra grey)
     { 91, 91, 67, 255 },
diff --git a/test/tests/ImageImporterTests.cpp b/test/tests/ImageImporterTests.cpp
index 54b7eb7835..501041b218 100644
--- a/test/tests/ImageImporterTests.cpp
+++ b/test/tests/ImageImporterTests.cpp
@@ -54,5 +54,5 @@ TEST_F(ImageImporterTests, Import_Logo)
     // Update expected hash if change is expected.
     ASSERT_NE(nullptr, result.Buffer.data());
     auto hash = GetHash(result.Buffer.data(), result.Buffer.size());
-    ASSERT_EQ(0xCEF27C7D, hash);
+    ASSERT_EQ(uint32_t(0x212A99BC), hash);
 }
diff --git a/test/tests/testdata/sprites/example.dat b/test/tests/testdata/sprites/example.dat
index c81bf87a4234626e337566b66771847ab8a5710e..ec82258aaf4f3837fa64c830493ed510a572e4a9 100644
GIT binary patch
delta 14
VcmeBn?sndAOPuk|=G)>MH~}%<28jRw

delta 14
VcmeBn?sndAOPulT=G)>MH~}%_28sXx

diff --git a/test/tests/testdata/sprites/result.dat b/test/tests/testdata/sprites/result.dat
deleted file mode 100644
index 1b1cb4d44c57c2d7a5122870fa6ac3e62ff7e94e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
KcmZQzfB*mh2mk>9