From f358b67205aee5fba92314d7dee423b701810360 Mon Sep 17 00:00:00 2001
From: Tillmann Karras <tilkax@gmail.com>
Date: Wed, 14 Aug 2024 00:17:44 +0100
Subject: [PATCH] GameSettings: remove patches for "Wallace & Gromit in Project
 Zoo"

These patches were added in bde9a459cdd7a465cf9c9e275bd4562bb072ae7e
and enabled by default in 36ecfdd6b597b0264625d06320a5308147bbc55b.
They allowed the game to run in Dolphin but disabled dynamic shadows.
The game adds 4 to the start address of otherwise valid display lists
for no obvious reason. Now that Dolphin forces 32-byte alignment these
patches are no longer needed.
---
 Data/Sys/ApprovedInis.json            | 10 +---------
 Data/Sys/GameSettings/GWLE6L.ini      | 10 ----------
 Data/Sys/GameSettings/GWLX6L.ini      | 10 ----------
 Source/Core/Core/AchievementManager.h |  4 ++--
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 Data/Sys/GameSettings/GWLE6L.ini
 delete mode 100644 Data/Sys/GameSettings/GWLX6L.ini

diff --git a/Data/Sys/ApprovedInis.json b/Data/Sys/ApprovedInis.json
index 85c8f7a067..3cbf34d556 100644
--- a/Data/Sys/ApprovedInis.json
+++ b/Data/Sys/ApprovedInis.json
@@ -192,14 +192,6 @@
     "title": "MVP Baseball 2004",
     "3159CA79B0A890131763EA6CB163684BEE886E3F": "Fix 2D Rendering"
   },
-  "GWLE6L": {
-    "title": "Project Zoo",
-    "C9101E4C6800FEEF18136846D771273593C21890": "Bypass FIFO reset"
-  },
-  "GWLX6L": {
-    "title": "Project Zoo",
-    "89C15ADC918F3A4399257534F326EB9F933AF040": "Bypass FIFO reset"
-  },
   "GXXE01": {
     "title": "Pokémon XD: Gale of Darkness",
     "64FAA15062F0D0C319F904BBDE9C4489A25D6369": "Allow Memory Card saving with Savestates"
@@ -320,4 +312,4 @@
     "title": "Gormiti: The Lords of Nature!",
     "6F8CD59D897338CA90939149E1A62588620C6D88": "Fix black screen"
   }
-}
\ No newline at end of file
+}
diff --git a/Data/Sys/GameSettings/GWLE6L.ini b/Data/Sys/GameSettings/GWLE6L.ini
deleted file mode 100644
index a6bf25f253..0000000000
--- a/Data/Sys/GameSettings/GWLE6L.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-# GWLE6L - Project Zoo
-
-[OnFrame]
-$Bypass FIFO reset
-0x8028EF00:dword:0x48000638
-[OnFrame_Enabled]
-$Bypass FIFO reset
-
-[Patches_RetroAchievements_Verified]
-$Bypass FIFO reset
diff --git a/Data/Sys/GameSettings/GWLX6L.ini b/Data/Sys/GameSettings/GWLX6L.ini
deleted file mode 100644
index bee1e2290b..0000000000
--- a/Data/Sys/GameSettings/GWLX6L.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-# GWLX6L - Project Zoo
-
-[OnFrame]
-$Bypass FIFO reset
-0x8028EE80:dword:0x48000638
-[OnFrame_Enabled]
-$Bypass FIFO reset
-
-[Patches_RetroAchievements_Verified]
-$Bypass FIFO reset
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index 6bc9e74a7a..13f2a9a14e 100644
--- a/Source/Core/Core/AchievementManager.h
+++ b/Source/Core/Core/AchievementManager.h
@@ -70,8 +70,8 @@ public:
   static constexpr std::string_view BLUE = "#0B71C1";
   static constexpr std::string_view APPROVED_LIST_FILENAME = "ApprovedInis.json";
   static const inline Common::SHA1::Digest APPROVED_LIST_HASH = {
-      0x01, 0x1E, 0x2E, 0x74, 0xDD, 0x07, 0x79, 0xDA, 0x0E, 0x5D,
-      0xF8, 0x51, 0x09, 0xC7, 0x9B, 0x46, 0x22, 0x95, 0x50, 0xE9};
+      0x50, 0x2F, 0x58, 0x02, 0x94, 0x60, 0x1B, 0x9F, 0x92, 0xC7,
+      0x04, 0x17, 0x50, 0x2E, 0xF3, 0x09, 0x8C, 0x8C, 0xD6, 0xC0};
 
   struct LeaderboardEntry
   {