From 60a0efc69c80c1d02e73bbe3ab914123ce13ff1c Mon Sep 17 00:00:00 2001
From: LillyJadeKatrin <lilly.kitty.1988@gmail.com>
Date: Fri, 8 Nov 2024 23:07:06 -0500
Subject: [PATCH] Add Approved Patches - Eternal Darkness, Monster Hunter Tri

The primary focus of this PR is the Eternal Darkness patch which fixes hanging at startup, which prior to this fix makes Eternal Darkness unplayable in hardcore. The MHTri patch was added as well simply because it could be.
---
 Data/Sys/ApprovedInis.json            | 20 ++++++++++++++++++++
 Data/Sys/GameSettings/GEDE01.ini      |  3 +++
 Data/Sys/GameSettings/GEDJ01.ini      |  3 +++
 Data/Sys/GameSettings/GEDP01.ini      |  3 +++
 Data/Sys/GameSettings/RMHE08.ini      |  3 +++
 Data/Sys/GameSettings/RMHJ08.ini      |  3 +++
 Data/Sys/GameSettings/RMHP08.ini      |  3 +++
 Source/Core/Core/AchievementManager.h |  4 ++--
 8 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Data/Sys/ApprovedInis.json b/Data/Sys/ApprovedInis.json
index 3cbf34d556..2132bd62fe 100644
--- a/Data/Sys/ApprovedInis.json
+++ b/Data/Sys/ApprovedInis.json
@@ -44,6 +44,18 @@
     "title": "Dead to Rights",
     "E23D98B2CE185C3993A40F2495D37E41B971BF91": "Fix audio issues"
   },
+  "GEDE01": {
+    "title": "Eternal Darkness",
+    "21068C3CE905FB0CFFAA7408A93154AF8A5295A2": "Fix startup hang"
+  },
+  "GEDJ01": {
+    "title": "Eternal Darkness",
+    "7061F3CF11BF64D3BA7F32CCF2BAC42FF3614AB6": "Fix startup hang"
+  },
+  "GEDP01": {
+    "title": "Eternal Darkness",
+    "6F1B00517CBA30BEB738EAA90E71221378CD570D": "Fix startup hang"
+  },
   "GEME7F": {
     "title": "Egg Mania: Eggstreme Madness",
     "CB04E00918C9C0F161715D21D046ED6620F7ADEF": "Force Progressive Scan"
@@ -236,6 +248,14 @@
     "title": "Ten Pin Alley 2",
     "793642AC6862C2F3412035A9E3D7172CC4A1D5C7": "Fix crash on main menu"
   },
+  "RMHE08": {
+    "title": "Monster Hunter Tri",
+    "CCF233DA57B3E75221870DE502955114B0D4E7FA": "Bloom OFF"
+  },
+  "RMHJ08": {
+    "title": "Monster Hunter Tri",
+    "29D3625B7ED577587E56AA07CB0EB8C47C97E823": "Bloom OFF"
+  },
   "RMHP08": {
     "title": "Monster Hunter Tri",
     "1720C1173D4698167080DBFC4232F21757C4DA08": "Bloom OFF"
diff --git a/Data/Sys/GameSettings/GEDE01.ini b/Data/Sys/GameSettings/GEDE01.ini
index ea5e41e2b5..630437c9e0 100644
--- a/Data/Sys/GameSettings/GEDE01.ini
+++ b/Data/Sys/GameSettings/GEDE01.ini
@@ -6,3 +6,6 @@ $Fix startup hang
 
 [OnFrame_Enabled]
 $Fix startup hang
+
+[Patches_RetroAchievements_Verified]
+$Fix startup hang
diff --git a/Data/Sys/GameSettings/GEDJ01.ini b/Data/Sys/GameSettings/GEDJ01.ini
index bcbe2fd03a..db2508e857 100644
--- a/Data/Sys/GameSettings/GEDJ01.ini
+++ b/Data/Sys/GameSettings/GEDJ01.ini
@@ -6,3 +6,6 @@ $Fix startup hang
 
 [OnFrame_Enabled]
 $Fix startup hang
+
+[Patches_RetroAchievements_Verified]
+$Fix startup hang
diff --git a/Data/Sys/GameSettings/GEDP01.ini b/Data/Sys/GameSettings/GEDP01.ini
index a56b27369e..346e61b205 100644
--- a/Data/Sys/GameSettings/GEDP01.ini
+++ b/Data/Sys/GameSettings/GEDP01.ini
@@ -6,3 +6,6 @@ $Fix startup hang
 
 [OnFrame_Enabled]
 $Fix startup hang
+
+[Patches_RetroAchievements_Verified]
+$Fix startup hang
diff --git a/Data/Sys/GameSettings/RMHE08.ini b/Data/Sys/GameSettings/RMHE08.ini
index 188822965e..35d7f4b724 100644
--- a/Data/Sys/GameSettings/RMHE08.ini
+++ b/Data/Sys/GameSettings/RMHE08.ini
@@ -8,3 +8,6 @@ $Bloom OFF
 
 [ActionReplay]
 # Add action replay cheats here.
+
+[Patches_RetroAchievements_Verified]
+$Bloom OFF
diff --git a/Data/Sys/GameSettings/RMHJ08.ini b/Data/Sys/GameSettings/RMHJ08.ini
index f8636f24ce..695b09c5f9 100644
--- a/Data/Sys/GameSettings/RMHJ08.ini
+++ b/Data/Sys/GameSettings/RMHJ08.ini
@@ -12,3 +12,6 @@ SafeTextureCacheColorSamples = 0
 
 [ActionReplay]
 # Add action replay cheats here.
+
+[Patches_RetroAchievements_Verified]
+$Bloom OFF
diff --git a/Data/Sys/GameSettings/RMHP08.ini b/Data/Sys/GameSettings/RMHP08.ini
index 89f99f077b..92db0fa7a6 100644
--- a/Data/Sys/GameSettings/RMHP08.ini
+++ b/Data/Sys/GameSettings/RMHP08.ini
@@ -11,3 +11,6 @@ $Bloom OFF
 
 [ActionReplay]
 # Add action replay cheats here.
+
+[Patches_RetroAchievements_Verified]
+$Bloom OFF
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index 553c789f4f..174b4abce1 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 = {
-      0x50, 0x2F, 0x58, 0x02, 0x94, 0x60, 0x1B, 0x9F, 0x92, 0xC7,
-      0x04, 0x17, 0x50, 0x2E, 0xF3, 0x09, 0x8C, 0x8C, 0xD6, 0xC0};
+      0xCC, 0xB4, 0x05, 0x2D, 0x2B, 0xEE, 0xF4, 0x06, 0x4A, 0xC9,
+      0x57, 0x5D, 0xA9, 0xE9, 0xDE, 0xB7, 0x98, 0xF8, 0x1A, 0x6D};
 
   struct LeaderboardEntry
   {