From 89fdc0b9e0db9b65b7ba81b8ee33114415e8666c Mon Sep 17 00:00:00 2001
From: Zopolis4 <creatorsmithmdt@gmail.com>
Date: Tue, 28 Sep 2021 10:48:24 +1000
Subject: [PATCH] Fix Triforce GameINIs

---
 Data/Sys/ApprovedInis.json            |  4 ----
 Data/Sys/GameSettings/GVS.ini         |  7 ++++++-
 Data/Sys/GameSettings/GVS46E.ini      | 18 ------------------
 Data/Sys/GameSettings/GVS46J.ini      | 18 ------------------
 Data/Sys/GameSettings/RELJAB.ini      | 18 ------------------
 Source/Core/Core/AchievementManager.h |  4 ++--
 6 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 Data/Sys/GameSettings/GVS46E.ini
 delete mode 100644 Data/Sys/GameSettings/GVS46J.ini
 delete mode 100644 Data/Sys/GameSettings/RELJAB.ini

diff --git a/Data/Sys/ApprovedInis.json b/Data/Sys/ApprovedInis.json
index 9d3b37c8d9..a73ed032f0 100644
--- a/Data/Sys/ApprovedInis.json
+++ b/Data/Sys/ApprovedInis.json
@@ -932,10 +932,6 @@
     "title": "Region Select",
     "AD12237401ABE9FE4A545AADB5C5AE10355E2076": "RSAPatch"
   },
-  "RELJAB": {
-    "title": "SegaBoot",
-    "130F3594CAB57B85616F95C7126F4748AAC5867D": "DI Seed Blanker"
-  },
   "RGQE70": {
     "title": "Ghostbusters",
     "5F4CF8D4DA19A0FF74FF9EB925AC0236069BFD59": "crashfix"
diff --git a/Data/Sys/GameSettings/GVS.ini b/Data/Sys/GameSettings/GVS.ini
index 780267fa56..90641b1723 100644
--- a/Data/Sys/GameSettings/GVS.ini
+++ b/Data/Sys/GameSettings/GVS.ini
@@ -1,4 +1,5 @@
-# GVSE8P, GVSP8P - Virtua Striker 3 ver. 2002
+# GVSP8P, GVSE8P, GVSJ8P - Virtua Striker 2002 (GC)
+# GVSJ8P - Virtua Striker 2002 (Triforce), Virtua Striker 4, Virtua Striker 4 ver. 2006
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -10,3 +11,7 @@ FPRF = True
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video]
+# Add memory patches to be applied every frame here.
+
+[Video_Settings]
diff --git a/Data/Sys/GameSettings/GVS46E.ini b/Data/Sys/GameSettings/GVS46E.ini
deleted file mode 100644
index 40061416f8..0000000000
--- a/Data/Sys/GameSettings/GVS46E.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GVS46E, GVS46J - Virtua Striker 4 ver. 2006
-# Because Triforce games have weird IDs, properties are inherited from GVS.ini (Virtua Striker 3 ver. 2002)!
-
-[Core]
-# Values set here will override the main Dolphin settings.
-FPRF = True
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
-
diff --git a/Data/Sys/GameSettings/GVS46J.ini b/Data/Sys/GameSettings/GVS46J.ini
deleted file mode 100644
index 40061416f8..0000000000
--- a/Data/Sys/GameSettings/GVS46J.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# GVS46E, GVS46J - Virtua Striker 4 ver. 2006
-# Because Triforce games have weird IDs, properties are inherited from GVS.ini (Virtua Striker 3 ver. 2002)!
-
-[Core]
-# Values set here will override the main Dolphin settings.
-FPRF = True
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video]
-# Add memory patches to be applied every frame here.
-
-[Video_Settings]
-
diff --git a/Data/Sys/GameSettings/RELJAB.ini b/Data/Sys/GameSettings/RELJAB.ini
deleted file mode 100644
index 872c654b6e..0000000000
--- a/Data/Sys/GameSettings/RELJAB.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-# RELJAB - SegaBoot
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-$DI Seed Blanker
-0x80000000:dword:0x00000000
-0x80000004:dword:0x00000000
-0x80000008:dword:0x00000000
-
-[Patches_RetroAchievements_Verified]
-$DI Seed Blanker
-
-[ActionReplay]
-# Add action replay cheats here.
-
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index f46b7e9da3..dfa6bb535e 100644
--- a/Source/Core/Core/AchievementManager.h
+++ b/Source/Core/Core/AchievementManager.h
@@ -80,8 +80,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 = {
-      0x4F, 0x45, 0xB7, 0xA3, 0xC4, 0x6E, 0xAF, 0x80, 0x58, 0xA5,
-      0x53, 0x99, 0xF8, 0x05, 0xC3, 0x83, 0x22, 0xA4, 0x5F, 0x65};
+      0xE1, 0x29, 0xD1, 0x33, 0x4D, 0xF2, 0xF8, 0xA8, 0x4E, 0xCA,
+      0xF6, 0x87, 0xE6, 0xEC, 0xEC, 0xB3, 0x18, 0x69, 0x34, 0x45};
 
   struct LeaderboardEntry
   {