From 0c14b0c8a70799072ddccb648006914af7c62855 Mon Sep 17 00:00:00 2001 From: LillyJadeKatrin Date: Fri, 21 Jun 2024 23:44:21 -0400 Subject: [PATCH] Add Approved Patch Allowlist for Achievements Prototype of a system to whitelist known game patches that are allowed to be used while RetroAchievements Hardcore mode is active. ApprovedInis.txt contains known hashes for the ini files as they appear in the repo, and can be compared to the local versions of these files to ensure they have not been edited locally by the player. ApprovedInis.txt is hashed and verified similarly first, with its hash residing as a const string within AchievementManager.h, ensuring ApprovedInis and the hashes within cannot be modified without editing Dolphin's source code and recompiling completely. --- Data/Sys/ApprovedInis.json | 323 ++++++++++++++++++++++++ Data/Sys/GameSettings/D43J01.ini | 3 + Data/Sys/GameSettings/G2BE5G.ini | 3 + Data/Sys/GameSettings/G2BP7D.ini | 3 + Data/Sys/GameSettings/GC6E01.ini | 3 + Data/Sys/GameSettings/GC6J01.ini | 3 + Data/Sys/GameSettings/GC6P01.ini | 3 + Data/Sys/GameSettings/GCCE01.ini | 4 + Data/Sys/GameSettings/GCCJGC.ini | 3 + Data/Sys/GameSettings/GCCP01.ini | 3 + Data/Sys/GameSettings/GDREAF.ini | 3 + Data/Sys/GameSettings/GDRP69.ini | 3 + Data/Sys/GameSettings/GEME7F.ini | 3 + Data/Sys/GameSettings/GEMJ28.ini | 3 + Data/Sys/GameSettings/GGVD78.ini | 3 + Data/Sys/GameSettings/GGVE78.ini | 3 + Data/Sys/GameSettings/GGVP78.ini | 3 + Data/Sys/GameSettings/GGVX78.ini | 3 + Data/Sys/GameSettings/GHAE08.ini | 3 + Data/Sys/GameSettings/GHAJ08.ini | 3 + Data/Sys/GameSettings/GHAP08.ini | 3 + Data/Sys/GameSettings/GICD78.ini | 3 + Data/Sys/GameSettings/GICE78.ini | 3 + Data/Sys/GameSettings/GICF78.ini | 3 + Data/Sys/GameSettings/GICH78.ini | 3 + Data/Sys/GameSettings/GICJG9.ini | 3 + Data/Sys/GameSettings/GICP78.ini | 3 + Data/Sys/GameSettings/GIQE78.ini | 3 + Data/Sys/GameSettings/GIQJ8P.ini | 3 + Data/Sys/GameSettings/GIQX78.ini | 3 + Data/Sys/GameSettings/GIQY78.ini | 3 + Data/Sys/GameSettings/GLEE08.ini | 3 + Data/Sys/GameSettings/GLEJ08.ini | 3 + Data/Sys/GameSettings/GLEP08.ini | 3 + Data/Sys/GameSettings/GLSD64.ini | 3 + Data/Sys/GameSettings/GLSE64.ini | 3 + Data/Sys/GameSettings/GLSF64.ini | 3 + Data/Sys/GameSettings/GLSP64.ini | 3 + Data/Sys/GameSettings/GNHE5d.ini | 3 + Data/Sys/GameSettings/GQPE78.ini | 3 + Data/Sys/GameSettings/GQPP78.ini | 3 + Data/Sys/GameSettings/GRYE41.ini | 3 + Data/Sys/GameSettings/GU2D78.ini | 3 + Data/Sys/GameSettings/GU2F78.ini | 3 + Data/Sys/GameSettings/GU3D78.ini | 3 + Data/Sys/GameSettings/GU3X78.ini | 3 + Data/Sys/GameSettings/GU4Y78.ini | 3 + Data/Sys/GameSettings/GV4E69.ini | 3 + Data/Sys/GameSettings/GVPE69.ini | 3 + Data/Sys/GameSettings/GWLE6L.ini | 3 + Data/Sys/GameSettings/GWLX6L.ini | 3 + Data/Sys/GameSettings/GXXE01.ini | 3 + Data/Sys/GameSettings/GXXJ01.ini | 3 + Data/Sys/GameSettings/GXXP01.ini | 3 + Data/Sys/GameSettings/GZ2E01.ini | 3 + Data/Sys/GameSettings/GZ2J01.ini | 3 + Data/Sys/GameSettings/GZ2P01.ini | 3 + Data/Sys/GameSettings/HAF.ini | 3 + Data/Sys/GameSettings/HAL.ini | 3 + Data/Sys/GameSettings/RELJAB.ini | 3 + Data/Sys/GameSettings/RGQE70.ini | 3 + Data/Sys/GameSettings/RLEEFS.ini | 3 + Data/Sys/GameSettings/RMHP08.ini | 3 + Data/Sys/GameSettings/RO2P7N.ini | 3 + Data/Sys/GameSettings/RPBE01.ini | 3 + Data/Sys/GameSettings/RPBJ01r0.ini | 3 + Data/Sys/GameSettings/RPBJ01r1.ini | 3 + Data/Sys/GameSettings/RPBJ01r2.ini | 3 + Data/Sys/GameSettings/RPBP01.ini | 3 + Data/Sys/GameSettings/RTH.ini | 3 + Data/Sys/GameSettings/RX4E4Z.ini | 3 + Data/Sys/GameSettings/RX4PMT.ini | 3 + Data/Sys/GameSettings/RZDE01r0.ini | 3 + Data/Sys/GameSettings/RZDE01r2.ini | 3 + Data/Sys/GameSettings/RZDJ01.ini | 3 + Data/Sys/GameSettings/RZDK01.ini | 3 + Data/Sys/GameSettings/RZDP01.ini | 3 + Data/Sys/GameSettings/SAOE78.ini | 3 + Data/Sys/GameSettings/SAOEVZ.ini | 3 + Data/Sys/GameSettings/SGLEA4.ini | 3 + Data/Sys/GameSettings/SGLPA4.ini | 3 + Source/Core/Core/AchievementManager.cpp | 72 ++++++ Source/Core/Core/AchievementManager.h | 20 +- Source/Core/Core/PatchEngine.cpp | 10 +- 84 files changed, 662 insertions(+), 4 deletions(-) create mode 100644 Data/Sys/ApprovedInis.json diff --git a/Data/Sys/ApprovedInis.json b/Data/Sys/ApprovedInis.json new file mode 100644 index 00000000000..85c8f7a0678 --- /dev/null +++ b/Data/Sys/ApprovedInis.json @@ -0,0 +1,323 @@ +{ + "D43J01": { + "title": "ZELDA OCARINA MULTI PACK", + "CAB9CED2D904F12CCB21F5B1DE9B5433620C3E13": "loophack" + }, + "G2BE5G": { + "title": "Black & Bruised", + "7FFF6BDD93713BEDFD23739C32B86153FA19AEA0": "Disable interlaced rendering" + }, + "G2BP7D": { + "title": "Black & Bruised", + "56E85D7285F10348E1E5354E379918D07E79EDA9": "Disable interlaced rendering" + }, + "GC6E01": { + "title": "Pokémon Colosseum", + "2F64F98686E62B60E466E931A9EBCD19A750FF4E": "Allow Memory Card saving with Savestates" + }, + "GC6J01": { + "title": "ポケモンコロシアム", + "D8F327304A88FBC717BB1F775494C5F864B9E8D2": "Allow Memory Card saving with Savestates" + }, + "GC6P01": { + "title": "Pokémon Colosseum", + "EDEE0E28EEA1834868F2865336290FFBDFB9C6DA": "Allow Memory Card saving with Savestates" + }, + "GCCE01": { + "title": "FINAL FANTASY Crystal Chronicles", + "6C107FEC15C76201233CA2645EB5FAB4FF9751CE": "Fix buffer overrun bug (crash at Goblin Wall)", + "483BDB94615C690045C3759795AF13CE76552286": "Fix GBA connections" + }, + "GCCJGC": { + "title": "FINAL FANTASY Crystal Chronicles", + "4C104D24329172F5D0F8649DE9423B931FE72CA3": "Fix GBA connections" + }, + "GCCP01": { + "title": "FINAL FANTASY Crystal Chronicles", + "2EAA60A8A115AD68A795109FB59E4A726D29016D": "Fix GBA connections" + }, + "GDREAF": { + "title": "Dead to Rights", + "F8EAE60FEB0CFB4477FDC4B9E136B63F68DFA63A": "Fix audio issues" + }, + "GDRP69": { + "title": "Dead to Rights", + "E23D98B2CE185C3993A40F2495D37E41B971BF91": "Fix audio issues" + }, + "GEME7F": { + "title": "Egg Mania: Eggstreme Madness", + "CB04E00918C9C0F161715D21D046ED6620F7ADEF": "Force Progressive Scan" + }, + "GEMJ28": { + "title": "Egg Mania: Eggstreme Madness", + "CC2057185BB10DAD4A361412D024DFD586EE0130": "Force Progressive Scan" + }, + "GGVD78": { + "title": "The SpongeBob SquarePants Movie", + "FE52240DF6D132C15A8324E8A477F2BF2250D208": "EFB Copy Fix" + }, + "GGVE78": { + "title": "The SpongeBob SquarePants Movie", + "5E38E10829D5F77243C95E9E41518BB3ADE24139": "EFB Copy Fix" + }, + "GGVP78": { + "title": "The SpongeBob SquarePants Movie", + "5E38E10829D5F77243C95E9E41518BB3ADE24139": "EFB Copy Fix" + }, + "GGVX78": { + "title": "The SpongeBob SquarePants Movie", + "740F2D1C01DA39D1760D96B03974A48E6F74578D": "EFB Copy Fix" + }, + "GHAE08": { + "title": "Resident Evil 2", + "9799AFF8463EC86C9230E31E2627E141F0C129D3": "Fix audio issues" + }, + "GHAJ08": { + "title": "Biohazard 2", + "B45A8FC32D14567B8D6C95F303E00A72C0E1D344": "Fix audio issues" + }, + "GHAP08": { + "title": "Resident Evil 2", + "BC7F3CFC97593AA2055C370C175950DC478D2709": "Fix audio issues" + }, + "GICD78": { + "title": "The Incredibles", + "3A94591A149AE88C150AB3320BBC909FE54BAEA5": "EFB Copy Fix" + }, + "GICE78": { + "title": "The Incredibles", + "5BF55685B8867A85EAA9C86571309B17BF7DED32": "EFB Copy Fix" + }, + "GICF78": { + "title": "The Incredibles", + "85AABAEB9A59C4F96D9330A3B884F6D757DA1683": "EFB Copy Fix" + }, + "GICH78": { + "title": "The Incredibles", + "3A94591A149AE88C150AB3320BBC909FE54BAEA5": "EFB Copy Fix" + }, + "GICJG9": { + "title": "The Incredibles", + "969134EA21A160EBDA91C0870266E7D1707FDC43": "EFB Copy Fix" + }, + "GICP78": { + "title": "The Incredibles", + "13B158CF41F5412BC637F50644193D43CC3DA49A": "EFB Copy Fix" + }, + "GIQE78": { + "title": "The Incredibles: Rise of the Underminer", + "E15AA1E30D26E5735D68AAADE436E7B7E4A33A35": "EFB Copy Fix" + }, + "GIQJ8P": { + "title": "The Incredibles: Rise of the Underminer", + "FFFCB76E98DDB06A7BBBC0AA73C869C87EB787D6": "EFB Copy Fix" + }, + "GIQX78": { + "title": "The Incredibles: Rise of the Underminer", + "485DA99FAB35646DAA2A138B0315361495ABE778": "EFB Copy Fix" + }, + "GIQY78": { + "title": "The Incredibles: Rise of the Underminer", + "485DA99FAB35646DAA2A138B0315361495ABE778": "EFB Copy Fix" + }, + "GLEE08": { + "title": "Resident Evil 3: Nemesis", + "7355F358CAC6F418D37E4C23E64F7867D46E4FC9": "Fix audio issues" + }, + "GLEJ08": { + "title": "BioHazard 3: Last Escape", + "12B24A6D7389A2AC5AB75FC0BF8493E7661F2A73": "Fix audio issues" + }, + "GLEP08": { + "title": "Resident Evil 3: Nemesis", + "81BD39F5527552DE89E3B59BA86298900F0A3168": "Fix audio issues" + }, + "GLSD64": { + "title": "Gladius", + "5E2A73717BD66EF647846DD64C33BC80AD9B5227": "Fix freeze in opening cutscene" + }, + "GLSE64": { + "title": "Gladius", + "1CE78E7954415A44DF693C0BB879AA5A4FF059A3": "Fix freeze in opening cutscene" + }, + "GLSF64": { + "title": "Gladius", + "009B0C4AD80A9C28C987934D254C2C4AACC9A07A": "Fix freeze in opening cutscene" + }, + "GLSP64": { + "title": "Gladius", + "3D0894616C9A7FA5ED91C1D2F461BF14DF47ECEC": "Fix freeze in opening cutscene" + }, + "GNHE5d": { + "title": "NHL HITZ 2002", + "89393A24E2336841AA4CD0AD3BE1C9A66B89E9EF": "Nop Hack" + }, + "GQPE78": { + "title": "SpongeBob SquarePants: Battle for Bikini Bottom", + "880B114E9A308084CAB92C004A9EE067B371C310": "EFB Copy Fix" + }, + "GQPP78": { + "title": "SpongeBob SquarePants: Battle for Bikini Bottom", + "5D9A14954AE8D639C9B254F3BA73A70F284BBC8D": "EFB Copy Fix" + }, + "GRYE41": { + "title": "Rayman Arena", + "AF0A575EB6071EAC0D2EC3D2EA30A23EB05A4192": "Disable Culling to Fix Rise and Shrine Hang" + }, + "GU2D78": { + "title": "2 Games in 1: The Incredibles / Finding Nemo", + "CFF4C3F932B08732627572EDA1A0CD2D9C71AE0C": "EFB Copy Fix" + }, + "GU2F78": { + "title": "2 Games in 1: The Incredibles / Finding Nemo", + "CFF4C3F932B08732627572EDA1A0CD2D9C71AE0C": "EFB Copy Fix" + }, + "GU3D78": { + "title": "2 Games in 1: The SpongeBob SquarePants Movie / Tak 2: The Staff of Dreams", + "8A0E3114862ADFE421874211BD6F5220AA425BF5": "EFB Copy Fix" + }, + "GU3X78": { + "title": "2 Games in 1: The SpongeBob SquarePants Movie / Tak 2: The Staff of Dreams", + "E3303FDAE7ECA17A72EDC440C32D94648A6453A0": "EFB Copy Fix" + }, + "GU4Y78": { + "title": "2 Games in 1: Nickelodeon SpongeBob Schwammkopf: Der Film + Nickelodeon SpongeBob Schwammkopf: Schlacht um Bikini Bottom", + "D54767785E139A8BC8C4B75573FBD5A0B686D8E3": "EFB Copy Fix" + }, + "GV4E69": { + "title": "MVP Baseball 2005", + "8679891FCAA250FCFF670B26E0CB9875900D17FD": "Fix 2D Rendering" + }, + "GVPE69": { + "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" + }, + "GXXJ01": { + "title": "ポケモンＸＤ 闇の旋風ダーク・ルギア", + "8293802260536FA2EF2EFDAB5266DE36BB88DE1B": "Allow Memory Card saving with Savestates" + }, + "GXXP01": { + "title": "Pokémon XD: Gale of Darkness", + "3CAFBC4AE6FC5CE9F53377F86AB5BD8F1BC8861A": "Allow Memory Card saving with Savestates" + }, + "GZ2E01": { + "title": "The Legend of Zelda: Twilight Princess [GC]", + "FCB673D46E716C7F63C618B8D8BF83AEE0B501F0": "Hyrule Field Speed Hack" + }, + "GZ2J01": { + "title": "The Legend of Zelda: Twilight Princess [GC]", + "FCB673D46E716C7F63C618B8D8BF83AEE0B501F0": "Hyrule Field Speed Hack" + }, + "GZ2P01": { + "title": "The Legend of Zelda: Twilight Princess [GC]", + "0F63623D4D984B7706F718F57C0ABDB6DBADCF8D": "Hyrule Field Speed Hack" + }, + "HAF": { + "title": "Forecast Channel", + "181195871F63B89B1CF09AFA4420CF89B9883108": "BufferPatch" + }, + "HAL": { + "title": "Region Select", + "AD12237401ABE9FE4A545AADB5C5AE10355E2076": "RSAPatch" + }, + "RELJAB": { + "title": "SegaBoot", + "130F3594CAB57B85616F95C7126F4748AAC5867D": "DI Seed Blanker" + }, + "RGQE70": { + "title": "Ghostbusters", + "5F4CF8D4DA19A0FF74FF9EB925AC0236069BFD59": "crashfix" + }, + "RLEEFS": { + "title": "Ten Pin Alley 2", + "793642AC6862C2F3412035A9E3D7172CC4A1D5C7": "Fix crash on main menu" + }, + "RMHP08": { + "title": "Monster Hunter Tri", + "1720C1173D4698167080DBFC4232F21757C4DA08": "Bloom OFF" + }, + "RO2P7N": { + "title": "OFF ROAD", + "EEE9C8DE4671C18DD7F81DD08D39B64C57600DEA": "Hangfix" + }, + "RPBE01": { + "title": "Pokemon Battle Revolution", + "775ABECA6073E02C5C68CF4D644194D966A418F5": "Fix black screen effects" + }, + "RPBJ01r0": { + "title": "Pokemon Battle Revolution", + "0EAB5D8DE827894AFEF97C10ACB67378E6983323": "Fix black screen effects" + }, + "RPBJ01r1": { + "title": "Pokemon Battle Revolution", + "4905E08643E9D00136F7EAF51978CF2F54D10D07": "Fix black screen effects" + }, + "RPBJ01r2": { + "title": "Pokemon Battle Revolution", + "4905E08643E9D00136F7EAF51978CF2F54D10D07": "Fix black screen effects" + }, + "RPBP01": { + "title": "Pokemon Battle Revolution", + "82AEB60F9A9083F93060531A970FFAABE0833A40": "Fix black screen effects" + }, + "RTH": { + "title": "Tony Hawk's Downhill Jam", + "812EE46AC967BFCD239335B10A664D71A93E8175": "Disable blur" + }, + "RX4E4Z": { + "title": "Casper's Scare School: Spooky Sports Day", + "9E4E0F1465A9A1E85349DBA3B1278AC215A97DBB": "Fix file reads (dcache bypass)" + }, + "RX4PMT": { + "title": "Casper's Scare School: Spooky Sports Day", + "EE85907C03F0295794821383B93F8D5B91D2697A": "Fix file reads (dcache bypass)" + }, + "RZDE01r0": { + "title": "The Legend of Zelda: Twilight Princess [Wii]", + "15EAD073414C9903D6CAE5229DCE582BD17A9162": "Hyrule Field Speed Hack" + }, + "RZDE01r2": { + "title": "The Legend of Zelda: Twilight Princess [Wii]", + "27395CC8BC2C51201D566657D31A471A850482FB": "Hyrule Field Speed Hack" + }, + "RZDJ01": { + "title": "The Legend of Zelda: Twilight Princess [Wii]", + "B3F7473F8C911A32F1D616491C9E78EBBD7A6309": "Hyrule Field Speed Hack" + }, + "RZDK01": { + "title": "The Legend of Zelda: Twilight Princess [Wii]", + "A280C0114B800D7DC056ECFB5E482229DA0B1550": "Hyrule Field Speed Hack" + }, + "RZDP01": { + "title": "The Legend of Zelda: Twilight Princess [Wii]", + "2A83ADFB760F9498841ED0ED68B0C0438232472C": "Hyrule Field Speed Hack" + }, + "SAOE78": { + "title": "Monster High: Ghoul Spirit", + "EA11FA4908FB20B61876ACD360EC7657A6D39FB2": "Fix crash on boot" + }, + "SAOEVZ": { + "title": "Monster High: Ghoul Spirit", + "AA55C214DE7545DE0E203CC39F06BF3D31451BE9": "Fix crash on boot" + }, + "SGLEA4": { + "title": "Gormiti: The Lords of Nature!", + "258378187ACF475A55EFEAF8A703681252E014C3": "Fix black screen" + }, + "SGLPA4": { + "title": "Gormiti: The Lords of Nature!", + "6F8CD59D897338CA90939149E1A62588620C6D88": "Fix black screen" + } +} \ No newline at end of file diff --git a/Data/Sys/GameSettings/D43J01.ini b/Data/Sys/GameSettings/D43J01.ini index 347e49b9499..373c98f9137 100644 --- a/Data/Sys/GameSettings/D43J01.ini +++ b/Data/Sys/GameSettings/D43J01.ini @@ -8,5 +8,8 @@ $loophack 0x806866E4:word:0x60000000 +[Patches_RetroAchievements_Verified] +$loophack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/G2BE5G.ini b/Data/Sys/GameSettings/G2BE5G.ini index af06b01fac1..fd8e9613426 100644 --- a/Data/Sys/GameSettings/G2BE5G.ini +++ b/Data/Sys/GameSettings/G2BE5G.ini @@ -11,6 +11,9 @@ $Disable interlaced rendering 0x800D8520:dword:0x38600000 +[Patches_RetroAchievements_Verified] +$Disable interlaced rendering + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/G2BP7D.ini b/Data/Sys/GameSettings/G2BP7D.ini index 39f453fcbb9..d3dc9a3b391 100644 --- a/Data/Sys/GameSettings/G2BP7D.ini +++ b/Data/Sys/GameSettings/G2BP7D.ini @@ -11,6 +11,9 @@ $Disable interlaced rendering 0x800D9E68:dword:0x38600000 +[Patches_RetroAchievements_Verified] +$Disable interlaced rendering + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/GC6E01.ini b/Data/Sys/GameSettings/GC6E01.ini index 7fa89bcfadf..5af8c69560f 100644 --- a/Data/Sys/GameSettings/GC6E01.ini +++ b/Data/Sys/GameSettings/GC6E01.ini @@ -25,3 +25,6 @@ $Allow Memory Card saving with Savestates 0x801cfc2c:dword:0x9005002c 0x801cfc7c:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Allow Memory Card saving with Savestates diff --git a/Data/Sys/GameSettings/GC6J01.ini b/Data/Sys/GameSettings/GC6J01.ini index 5368a547a0c..eb8bd994a81 100644 --- a/Data/Sys/GameSettings/GC6J01.ini +++ b/Data/Sys/GameSettings/GC6J01.ini @@ -25,3 +25,6 @@ $Allow Memory Card saving with Savestates 0x801cb5b8:dword:0x9005002c 0x801cb608:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Allow Memory Card saving with Savestates diff --git a/Data/Sys/GameSettings/GC6P01.ini b/Data/Sys/GameSettings/GC6P01.ini index cfc8c6cbe04..8f02b22bd38 100644 --- a/Data/Sys/GameSettings/GC6P01.ini +++ b/Data/Sys/GameSettings/GC6P01.ini @@ -25,3 +25,6 @@ $Allow Memory Card saving with Savestates 0x801d429c:dword:0x9005002c 0x801d42ec:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Allow Memory Card saving with Savestates diff --git a/Data/Sys/GameSettings/GCCE01.ini b/Data/Sys/GameSettings/GCCE01.ini index 0066794bba3..e9ccea73609 100644 --- a/Data/Sys/GameSettings/GCCE01.ini +++ b/Data/Sys/GameSettings/GCCE01.ini @@ -29,6 +29,10 @@ $Fix GBA connections [OnFrame_Enabled] $Fix GBA connections +[Patches_RetroAchievements_Verified] +$Fix buffer overrun bug (crash at Goblin Wall) +$Fix GBA connections + [ActionReplay] # Add action replay cheats here. $Infinite Health: Single Player diff --git a/Data/Sys/GameSettings/GCCJGC.ini b/Data/Sys/GameSettings/GCCJGC.ini index bcbc70da9e7..f2967432f29 100644 --- a/Data/Sys/GameSettings/GCCJGC.ini +++ b/Data/Sys/GameSettings/GCCJGC.ini @@ -23,3 +23,6 @@ $Fix GBA connections [OnFrame_Enabled] $Fix GBA connections + +[Patches_RetroAchievements_Verified] +$Fix GBA connections diff --git a/Data/Sys/GameSettings/GCCP01.ini b/Data/Sys/GameSettings/GCCP01.ini index c37aca32af2..71100cbbcee 100644 --- a/Data/Sys/GameSettings/GCCP01.ini +++ b/Data/Sys/GameSettings/GCCP01.ini @@ -23,3 +23,6 @@ $Fix GBA connections [OnFrame_Enabled] $Fix GBA connections + +[Patches_RetroAchievements_Verified] +$Fix GBA connections diff --git a/Data/Sys/GameSettings/GDREAF.ini b/Data/Sys/GameSettings/GDREAF.ini index 9f98d82fd06..a07afe24b93 100644 --- a/Data/Sys/GameSettings/GDREAF.ini +++ b/Data/Sys/GameSettings/GDREAF.ini @@ -9,3 +9,6 @@ $Fix audio issues 0x8000AF34:dword:0x60000000 [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GDRP69.ini b/Data/Sys/GameSettings/GDRP69.ini index ae3fc95a2f8..81efcef87b6 100644 --- a/Data/Sys/GameSettings/GDRP69.ini +++ b/Data/Sys/GameSettings/GDRP69.ini @@ -9,3 +9,6 @@ $Fix audio issues 0x8000B7EC:dword:0x60000000 [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GEME7F.ini b/Data/Sys/GameSettings/GEME7F.ini index e44d7b6960b..842bbbfb9ba 100644 --- a/Data/Sys/GameSettings/GEME7F.ini +++ b/Data/Sys/GameSettings/GEME7F.ini @@ -10,3 +10,6 @@ $Force Progressive Scan 0x806D0898:dword:0x801671CC [OnFrame_Enabled] $Force Progressive Scan + +[Patches_RetroAchievements_Verified] +$Force Progressive Scan diff --git a/Data/Sys/GameSettings/GEMJ28.ini b/Data/Sys/GameSettings/GEMJ28.ini index 0c32470103b..1ba4951a9e6 100644 --- a/Data/Sys/GameSettings/GEMJ28.ini +++ b/Data/Sys/GameSettings/GEMJ28.ini @@ -10,3 +10,6 @@ $Force Progressive Scan 0x806D0660:dword:0x801640A4 [OnFrame_Enabled] $Force Progressive Scan + +[Patches_RetroAchievements_Verified] +$Force Progressive Scan diff --git a/Data/Sys/GameSettings/GGVD78.ini b/Data/Sys/GameSettings/GGVD78.ini index 2af4c9f3a3f..932ebdc5f5c 100644 --- a/Data/Sys/GameSettings/GGVD78.ini +++ b/Data/Sys/GameSettings/GGVD78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GGVE78.ini b/Data/Sys/GameSettings/GGVE78.ini index 32bec5e8bbb..2f357fb0905 100644 --- a/Data/Sys/GameSettings/GGVE78.ini +++ b/Data/Sys/GameSettings/GGVE78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GGVP78.ini b/Data/Sys/GameSettings/GGVP78.ini index 156e7bfa860..6bac93ba18c 100644 --- a/Data/Sys/GameSettings/GGVP78.ini +++ b/Data/Sys/GameSettings/GGVP78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GGVX78.ini b/Data/Sys/GameSettings/GGVX78.ini index c0a94843fda..6bd903205eb 100644 --- a/Data/Sys/GameSettings/GGVX78.ini +++ b/Data/Sys/GameSettings/GGVX78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GHAE08.ini b/Data/Sys/GameSettings/GHAE08.ini index 373cbb45e39..242310c0589 100644 --- a/Data/Sys/GameSettings/GHAE08.ini +++ b/Data/Sys/GameSettings/GHAE08.ini @@ -14,3 +14,6 @@ $Fix audio issues 0x8055AB54:dword:0x60000000:0x4BAA85AD [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GHAJ08.ini b/Data/Sys/GameSettings/GHAJ08.ini index 9bb3feec95d..eb58677c274 100644 --- a/Data/Sys/GameSettings/GHAJ08.ini +++ b/Data/Sys/GameSettings/GHAJ08.ini @@ -14,3 +14,6 @@ $Fix audio issues 0x805C5BFC:dword:0x60000000:0x4BA3D505 [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GHAP08.ini b/Data/Sys/GameSettings/GHAP08.ini index d6e39d5c170..3b7df30169f 100644 --- a/Data/Sys/GameSettings/GHAP08.ini +++ b/Data/Sys/GameSettings/GHAP08.ini @@ -30,3 +30,6 @@ $Fix audio issues 0x8055CEBC:dword:0x60000000:0x4BAA6245 [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GICD78.ini b/Data/Sys/GameSettings/GICD78.ini index f05b308a07f..14f7941e684 100644 --- a/Data/Sys/GameSettings/GICD78.ini +++ b/Data/Sys/GameSettings/GICD78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GICE78.ini b/Data/Sys/GameSettings/GICE78.ini index b60f33c6b3e..f4684b75e19 100644 --- a/Data/Sys/GameSettings/GICE78.ini +++ b/Data/Sys/GameSettings/GICE78.ini @@ -13,6 +13,9 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. $EFB Copy Fix +[Patches_RetroAchievements_Verified] +$EFB Copy Fix + [ActionReplay] # Add action replay cheats here. $Infinite Health diff --git a/Data/Sys/GameSettings/GICF78.ini b/Data/Sys/GameSettings/GICF78.ini index 2f47a1b8d71..75259ad265b 100644 --- a/Data/Sys/GameSettings/GICF78.ini +++ b/Data/Sys/GameSettings/GICF78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GICH78.ini b/Data/Sys/GameSettings/GICH78.ini index 063f9da83b7..fa6a26b21c8 100644 --- a/Data/Sys/GameSettings/GICH78.ini +++ b/Data/Sys/GameSettings/GICH78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GICJG9.ini b/Data/Sys/GameSettings/GICJG9.ini index 1ffdd77d9e9..5096ec20f83 100644 --- a/Data/Sys/GameSettings/GICJG9.ini +++ b/Data/Sys/GameSettings/GICJG9.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GICP78.ini b/Data/Sys/GameSettings/GICP78.ini index 6b1186ed6f7..81c3ed66c61 100644 --- a/Data/Sys/GameSettings/GICP78.ini +++ b/Data/Sys/GameSettings/GICP78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GIQE78.ini b/Data/Sys/GameSettings/GIQE78.ini index f48c3763916..3a20714fe8e 100644 --- a/Data/Sys/GameSettings/GIQE78.ini +++ b/Data/Sys/GameSettings/GIQE78.ini @@ -13,6 +13,9 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. $EFB Copy Fix +[Patches_RetroAchievements_Verified] +$EFB Copy Fix + [ActionReplay] # Add action replay cheats here. $Infinite Specials diff --git a/Data/Sys/GameSettings/GIQJ8P.ini b/Data/Sys/GameSettings/GIQJ8P.ini index 668bc295c19..123445926fe 100644 --- a/Data/Sys/GameSettings/GIQJ8P.ini +++ b/Data/Sys/GameSettings/GIQJ8P.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GIQX78.ini b/Data/Sys/GameSettings/GIQX78.ini index a8fbe89ad4c..be8ece5efb3 100644 --- a/Data/Sys/GameSettings/GIQX78.ini +++ b/Data/Sys/GameSettings/GIQX78.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GIQY78.ini b/Data/Sys/GameSettings/GIQY78.ini index 9375354afb1..70470885264 100644 --- a/Data/Sys/GameSettings/GIQY78.ini +++ b/Data/Sys/GameSettings/GIQY78.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GLEE08.ini b/Data/Sys/GameSettings/GLEE08.ini index 90759a99a91..c25c7d06344 100644 --- a/Data/Sys/GameSettings/GLEE08.ini +++ b/Data/Sys/GameSettings/GLEE08.ini @@ -10,3 +10,6 @@ $Fix audio issues 0x80150E94:dword:0x60000000 [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GLEJ08.ini b/Data/Sys/GameSettings/GLEJ08.ini index 5c8ebc84fc9..afaa82f0670 100644 --- a/Data/Sys/GameSettings/GLEJ08.ini +++ b/Data/Sys/GameSettings/GLEJ08.ini @@ -10,3 +10,6 @@ $Fix audio issues 0x8015110C:dword:0x60000000 [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GLEP08.ini b/Data/Sys/GameSettings/GLEP08.ini index 9c947103ace..43d21161f72 100644 --- a/Data/Sys/GameSettings/GLEP08.ini +++ b/Data/Sys/GameSettings/GLEP08.ini @@ -18,3 +18,6 @@ $Fix audio issues 0x8058CEA4:dword:0x60000000:0x4BA7625D [OnFrame_Enabled] $Fix audio issues + +[Patches_RetroAchievements_Verified] +$Fix audio issues diff --git a/Data/Sys/GameSettings/GLSD64.ini b/Data/Sys/GameSettings/GLSD64.ini index 83fcec325fd..f0e3f06f057 100644 --- a/Data/Sys/GameSettings/GLSD64.ini +++ b/Data/Sys/GameSettings/GLSD64.ini @@ -18,3 +18,6 @@ $Fix freeze in opening cutscene [OnFrame_Enabled] $Fix freeze in opening cutscene + +[Patches_RetroAchievements_Verified] +$Fix freeze in opening cutscene diff --git a/Data/Sys/GameSettings/GLSE64.ini b/Data/Sys/GameSettings/GLSE64.ini index 0cee6fb0caa..58bb286eb4d 100644 --- a/Data/Sys/GameSettings/GLSE64.ini +++ b/Data/Sys/GameSettings/GLSE64.ini @@ -18,3 +18,6 @@ $Fix freeze in opening cutscene [OnFrame_Enabled] $Fix freeze in opening cutscene + +[Patches_RetroAchievements_Verified] +$Fix freeze in opening cutscene diff --git a/Data/Sys/GameSettings/GLSF64.ini b/Data/Sys/GameSettings/GLSF64.ini index a29a7cc5877..4cde1fdd8e6 100644 --- a/Data/Sys/GameSettings/GLSF64.ini +++ b/Data/Sys/GameSettings/GLSF64.ini @@ -18,3 +18,6 @@ $Fix freeze in opening cutscene [OnFrame_Enabled] $Fix freeze in opening cutscene + +[Patches_RetroAchievements_Verified] +$Fix freeze in opening cutscene diff --git a/Data/Sys/GameSettings/GLSP64.ini b/Data/Sys/GameSettings/GLSP64.ini index 251eccc4e56..3a2eff7c47b 100644 --- a/Data/Sys/GameSettings/GLSP64.ini +++ b/Data/Sys/GameSettings/GLSP64.ini @@ -18,3 +18,6 @@ $Fix freeze in opening cutscene [OnFrame_Enabled] $Fix freeze in opening cutscene + +[Patches_RetroAchievements_Verified] +$Fix freeze in opening cutscene diff --git a/Data/Sys/GameSettings/GNHE5d.ini b/Data/Sys/GameSettings/GNHE5d.ini index 9329d6c2984..efd4c622689 100644 --- a/Data/Sys/GameSettings/GNHE5d.ini +++ b/Data/Sys/GameSettings/GNHE5d.ini @@ -8,5 +8,8 @@ $Nop Hack 0x80025BA0:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Nop Hack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/GQPE78.ini b/Data/Sys/GameSettings/GQPE78.ini index 61d50ed7534..3407be428ed 100644 --- a/Data/Sys/GameSettings/GQPE78.ini +++ b/Data/Sys/GameSettings/GQPE78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GQPP78.ini b/Data/Sys/GameSettings/GQPP78.ini index dd3ee36e7d3..4e11d4f3bd0 100644 --- a/Data/Sys/GameSettings/GQPP78.ini +++ b/Data/Sys/GameSettings/GQPP78.ini @@ -12,3 +12,6 @@ $EFB Copy Fix # resolutions. In order for this patch to fully work, the # Vertex Rounding Hack must be enabled. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GRYE41.ini b/Data/Sys/GameSettings/GRYE41.ini index 9449f1ec332..fedae056f16 100644 --- a/Data/Sys/GameSettings/GRYE41.ini +++ b/Data/Sys/GameSettings/GRYE41.ini @@ -12,3 +12,6 @@ $Disable Culling to Fix Rise and Shrine Hang # causes the "Rise and Shrine" hang in Dolphin. # There is no noticeable side-effects unless Dolphin's # built-in Widescreen Hack is enabled. + +[Patches_RetroAchievements_Verified] +$Disable Culling to Fix Rise and Shrine Hang diff --git a/Data/Sys/GameSettings/GU2D78.ini b/Data/Sys/GameSettings/GU2D78.ini index c936e280cec..d1e83e267a2 100644 --- a/Data/Sys/GameSettings/GU2D78.ini +++ b/Data/Sys/GameSettings/GU2D78.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. # Patch has been made conditional to prevent causing issues on disc 2. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GU2F78.ini b/Data/Sys/GameSettings/GU2F78.ini index 04bef5ba980..9f39bd7c6bd 100644 --- a/Data/Sys/GameSettings/GU2F78.ini +++ b/Data/Sys/GameSettings/GU2F78.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. # Patch has been made conditional to prevent causing issues on disc 2. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GU3D78.ini b/Data/Sys/GameSettings/GU3D78.ini index 7d4f3bde13e..165f8b0a814 100644 --- a/Data/Sys/GameSettings/GU3D78.ini +++ b/Data/Sys/GameSettings/GU3D78.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. # The patch has been made conditional as not to crash disc 2's game. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GU3X78.ini b/Data/Sys/GameSettings/GU3X78.ini index cb7341e2612..8ed19c6c03a 100644 --- a/Data/Sys/GameSettings/GU3X78.ini +++ b/Data/Sys/GameSettings/GU3X78.ini @@ -13,3 +13,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. # The patch has been made conditional as not to crash disc 2's game. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GU4Y78.ini b/Data/Sys/GameSettings/GU4Y78.ini index fee110ccb30..958bf986f09 100644 --- a/Data/Sys/GameSettings/GU4Y78.ini +++ b/Data/Sys/GameSettings/GU4Y78.ini @@ -20,3 +20,6 @@ $EFB Copy Fix # Vertex Rounding Hack must be enabled. # These patches have been made conditional. $EFB Copy Fix + +[Patches_RetroAchievements_Verified] +$EFB Copy Fix diff --git a/Data/Sys/GameSettings/GV4E69.ini b/Data/Sys/GameSettings/GV4E69.ini index 77ffcaf7494..d9117452f62 100644 --- a/Data/Sys/GameSettings/GV4E69.ini +++ b/Data/Sys/GameSettings/GV4E69.ini @@ -5,3 +5,6 @@ $Fix 2D Rendering 0x80319214:dword:0x48113250 [OnFrame_Enabled] $Fix 2D Rendering + +[Patches_RetroAchievements_Verified] +$Fix 2D Rendering diff --git a/Data/Sys/GameSettings/GVPE69.ini b/Data/Sys/GameSettings/GVPE69.ini index afc48b4b435..926a01b456c 100644 --- a/Data/Sys/GameSettings/GVPE69.ini +++ b/Data/Sys/GameSettings/GVPE69.ini @@ -5,3 +5,6 @@ $Fix 2D Rendering 0x803C92D4:dword:0x480DA8E4 [OnFrame_Enabled] $Fix 2D Rendering + +[Patches_RetroAchievements_Verified] +$Fix 2D Rendering diff --git a/Data/Sys/GameSettings/GWLE6L.ini b/Data/Sys/GameSettings/GWLE6L.ini index 579430712f0..a6bf25f253b 100644 --- a/Data/Sys/GameSettings/GWLE6L.ini +++ b/Data/Sys/GameSettings/GWLE6L.ini @@ -5,3 +5,6 @@ $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 index fdf558ac8c2..bee1e2290bc 100644 --- a/Data/Sys/GameSettings/GWLX6L.ini +++ b/Data/Sys/GameSettings/GWLX6L.ini @@ -5,3 +5,6 @@ $Bypass FIFO reset 0x8028EE80:dword:0x48000638 [OnFrame_Enabled] $Bypass FIFO reset + +[Patches_RetroAchievements_Verified] +$Bypass FIFO reset diff --git a/Data/Sys/GameSettings/GXXE01.ini b/Data/Sys/GameSettings/GXXE01.ini index fa16f3d897b..fdf9d338dda 100644 --- a/Data/Sys/GameSettings/GXXE01.ini +++ b/Data/Sys/GameSettings/GXXE01.ini @@ -5,3 +5,6 @@ $Allow Memory Card saving with Savestates 0x801cc304:dword:0x90e5002c 0x801cc4b0:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Allow Memory Card saving with Savestates diff --git a/Data/Sys/GameSettings/GXXJ01.ini b/Data/Sys/GameSettings/GXXJ01.ini index a03a774a0d8..505aa9d828c 100644 --- a/Data/Sys/GameSettings/GXXJ01.ini +++ b/Data/Sys/GameSettings/GXXJ01.ini @@ -5,3 +5,6 @@ $Allow Memory Card saving with Savestates 0x801c7984:dword:0x90e5002c 0x801c7b30:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Allow Memory Card saving with Savestates diff --git a/Data/Sys/GameSettings/GXXP01.ini b/Data/Sys/GameSettings/GXXP01.ini index 837c59c3e44..5b02d18d0f2 100644 --- a/Data/Sys/GameSettings/GXXP01.ini +++ b/Data/Sys/GameSettings/GXXP01.ini @@ -5,3 +5,6 @@ $Allow Memory Card saving with Savestates 0x801cd764:dword:0x90e5002c 0x801cd910:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Allow Memory Card saving with Savestates diff --git a/Data/Sys/GameSettings/GZ2E01.ini b/Data/Sys/GameSettings/GZ2E01.ini index 7cf0fc16b94..4d7b950074f 100644 --- a/Data/Sys/GameSettings/GZ2E01.ini +++ b/Data/Sys/GameSettings/GZ2E01.ini @@ -39,6 +39,9 @@ $Hyrule Field Speed Hack 0x8003D5EC:dword:0x60000000 0x8003D608:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. $Infinite Health diff --git a/Data/Sys/GameSettings/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini index c3622c0553e..50c948ff3b0 100644 --- a/Data/Sys/GameSettings/GZ2J01.ini +++ b/Data/Sys/GameSettings/GZ2J01.ini @@ -35,3 +35,6 @@ $Hyrule Field Speed Hack 0x8003D5D4:dword:0x60000000 0x8003D5EC:dword:0x60000000 0x8003D608:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack diff --git a/Data/Sys/GameSettings/GZ2P01.ini b/Data/Sys/GameSettings/GZ2P01.ini index 56e38c8523d..c99b22c34bf 100644 --- a/Data/Sys/GameSettings/GZ2P01.ini +++ b/Data/Sys/GameSettings/GZ2P01.ini @@ -39,6 +39,9 @@ $Hyrule Field Speed Hack 0x8003d71c:dword:0x60000000 0x8003d738:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. $Infinite Health diff --git a/Data/Sys/GameSettings/HAF.ini b/Data/Sys/GameSettings/HAF.ini index b6296a9819e..b28e20df17e 100644 --- a/Data/Sys/GameSettings/HAF.ini +++ b/Data/Sys/GameSettings/HAF.ini @@ -19,6 +19,9 @@ $BufferPatch 0x8000B08E:word:0x00000008 0x8000B09E:word:0x00007000 +[Patches_RetroAchievements_Verified] +$BufferPatch + [WC24Patch] $Main weather.wapp.wii.com:fore.wiilink24.com:1 diff --git a/Data/Sys/GameSettings/HAL.ini b/Data/Sys/GameSettings/HAL.ini index 5d8cd65f8bf..0ab222db76f 100644 --- a/Data/Sys/GameSettings/HAL.ini +++ b/Data/Sys/GameSettings/HAL.ini @@ -11,6 +11,9 @@ $RSAPatch 0x8001AB20:dword:0x38600001 0x8001AC68:dword:0x38600001 +[Patches_RetroAchievements_Verified] +$RSAPatch + [WC24Patch] $Main cfh.wapp.wii.com:ch.wiilink24.com:1 diff --git a/Data/Sys/GameSettings/RELJAB.ini b/Data/Sys/GameSettings/RELJAB.ini index 519d8901a94..90543a1c23b 100644 --- a/Data/Sys/GameSettings/RELJAB.ini +++ b/Data/Sys/GameSettings/RELJAB.ini @@ -13,6 +13,9 @@ $DI Seed Blanker 0x80000004:dword:0x00000000 0x80000008:dword:0x00000000 +[Patches_RetroAchievements_Verified] +$DI Seed Blanker + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RGQE70.ini b/Data/Sys/GameSettings/RGQE70.ini index fcd04fb22b2..5cc3381c46b 100644 --- a/Data/Sys/GameSettings/RGQE70.ini +++ b/Data/Sys/GameSettings/RGQE70.ini @@ -8,5 +8,8 @@ $crashfix 0x8006935C:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$crashfix + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RLEEFS.ini b/Data/Sys/GameSettings/RLEEFS.ini index a16579762b5..0bd00909eca 100644 --- a/Data/Sys/GameSettings/RLEEFS.ini +++ b/Data/Sys/GameSettings/RLEEFS.ini @@ -9,3 +9,6 @@ $Fix crash on main menu [OnFrame_Enabled] $Fix crash on main menu + +[Patches_RetroAchievements_Verified] +$Fix crash on main menu diff --git a/Data/Sys/GameSettings/RMHP08.ini b/Data/Sys/GameSettings/RMHP08.ini index 83850071ac1..7916926fcdb 100644 --- a/Data/Sys/GameSettings/RMHP08.ini +++ b/Data/Sys/GameSettings/RMHP08.ini @@ -9,5 +9,8 @@ $Bloom OFF 0x80057058:dword:0xC022FFE4 0x8079FF44:dword:0x3F800000 +[Patches_RetroAchievements_Verified] +$Bloom OFF + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RO2P7N.ini b/Data/Sys/GameSettings/RO2P7N.ini index b50875b06c6..4c54f16eb57 100644 --- a/Data/Sys/GameSettings/RO2P7N.ini +++ b/Data/Sys/GameSettings/RO2P7N.ini @@ -10,5 +10,8 @@ $Hangfix 0x8007D344:byte:0x00000090 0x8007D348:byte:0x00000090 +[Patches_RetroAchievements_Verified] +$Hangfix + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RPBE01.ini b/Data/Sys/GameSettings/RPBE01.ini index 8b7fc7d50d9..88cfdd165df 100644 --- a/Data/Sys/GameSettings/RPBE01.ini +++ b/Data/Sys/GameSettings/RPBE01.ini @@ -8,3 +8,6 @@ $Fix black screen effects 0x80244A94:dword:0x39080000 0x80244A9C:dword:0x38030000 + +[Patches_RetroAchievements_Verified] +$Fix black screen effects diff --git a/Data/Sys/GameSettings/RPBJ01r0.ini b/Data/Sys/GameSettings/RPBJ01r0.ini index 7982d0a7058..87c16fd35c9 100644 --- a/Data/Sys/GameSettings/RPBJ01r0.ini +++ b/Data/Sys/GameSettings/RPBJ01r0.ini @@ -8,3 +8,6 @@ $Fix black screen effects 0x802342DC:dword:0x39080000 0x802342E4:dword:0x38030000 + +[Patches_RetroAchievements_Verified] +$Fix black screen effects diff --git a/Data/Sys/GameSettings/RPBJ01r1.ini b/Data/Sys/GameSettings/RPBJ01r1.ini index ddaf42f3eea..05c5511840e 100644 --- a/Data/Sys/GameSettings/RPBJ01r1.ini +++ b/Data/Sys/GameSettings/RPBJ01r1.ini @@ -8,3 +8,6 @@ $Fix black screen effects 0x80234580:dword:0x39080000 0x80234588:dword:0x38030000 + +[Patches_RetroAchievements_Verified] +$Fix black screen effects diff --git a/Data/Sys/GameSettings/RPBJ01r2.ini b/Data/Sys/GameSettings/RPBJ01r2.ini index ddaf42f3eea..05c5511840e 100644 --- a/Data/Sys/GameSettings/RPBJ01r2.ini +++ b/Data/Sys/GameSettings/RPBJ01r2.ini @@ -8,3 +8,6 @@ $Fix black screen effects 0x80234580:dword:0x39080000 0x80234588:dword:0x38030000 + +[Patches_RetroAchievements_Verified] +$Fix black screen effects diff --git a/Data/Sys/GameSettings/RPBP01.ini b/Data/Sys/GameSettings/RPBP01.ini index 50024b6704b..c14a0d89f72 100644 --- a/Data/Sys/GameSettings/RPBP01.ini +++ b/Data/Sys/GameSettings/RPBP01.ini @@ -8,3 +8,6 @@ $Fix black screen effects 0x8023FF50:dword:0x39080000 0x8023FF58:dword:0x38030000 + +[Patches_RetroAchievements_Verified] +$Fix black screen effects diff --git a/Data/Sys/GameSettings/RTH.ini b/Data/Sys/GameSettings/RTH.ini index 5234f0ea7ec..4977ff46dde 100644 --- a/Data/Sys/GameSettings/RTH.ini +++ b/Data/Sys/GameSettings/RTH.ini @@ -11,6 +11,9 @@ $Disable blur 0x8015b900:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Disable blur + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RX4E4Z.ini b/Data/Sys/GameSettings/RX4E4Z.ini index 093e76cca6b..05cde86aa52 100644 --- a/Data/Sys/GameSettings/RX4E4Z.ini +++ b/Data/Sys/GameSettings/RX4E4Z.ini @@ -26,3 +26,6 @@ $Fix file reads (dcache bypass) 0x800d2e68:dword:0x60000000 [OnFrame_Enabled] $Fix file reads (dcache bypass) + +[Patches_RetroAchievements_Verified] +$Fix file reads (dcache bypass) diff --git a/Data/Sys/GameSettings/RX4PMT.ini b/Data/Sys/GameSettings/RX4PMT.ini index d23a8077442..c0f5d1e327c 100644 --- a/Data/Sys/GameSettings/RX4PMT.ini +++ b/Data/Sys/GameSettings/RX4PMT.ini @@ -26,3 +26,6 @@ $Fix file reads (dcache bypass) 0x80164b90:dword:0x60000000 [OnFrame_Enabled] $Fix file reads (dcache bypass) + +[Patches_RetroAchievements_Verified] +$Fix file reads (dcache bypass) diff --git a/Data/Sys/GameSettings/RZDE01r0.ini b/Data/Sys/GameSettings/RZDE01r0.ini index 7b31eead410..baf02ed5b47 100644 --- a/Data/Sys/GameSettings/RZDE01r0.ini +++ b/Data/Sys/GameSettings/RZDE01r0.ini @@ -38,5 +38,8 @@ $Hyrule Field Speed Hack 0x80040D14:dword:0x60000000 0x80040D30:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RZDE01r2.ini b/Data/Sys/GameSettings/RZDE01r2.ini index 3c1c2874e06..4843f3e3c3c 100644 --- a/Data/Sys/GameSettings/RZDE01r2.ini +++ b/Data/Sys/GameSettings/RZDE01r2.ini @@ -38,5 +38,8 @@ $Hyrule Field Speed Hack 0x80040EC4:dword:0x60000000 0x80040EE0:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RZDJ01.ini b/Data/Sys/GameSettings/RZDJ01.ini index f812a9512b0..f8d488b48cf 100644 --- a/Data/Sys/GameSettings/RZDJ01.ini +++ b/Data/Sys/GameSettings/RZDJ01.ini @@ -37,5 +37,8 @@ $Hyrule Field Speed Hack 0x80040E40:dword:0x60000000 0x80040E5C:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RZDK01.ini b/Data/Sys/GameSettings/RZDK01.ini index cc92b01b5d7..0b773f4e2e2 100644 --- a/Data/Sys/GameSettings/RZDK01.ini +++ b/Data/Sys/GameSettings/RZDK01.ini @@ -37,5 +37,8 @@ $Hyrule Field Speed Hack 0x80047EC8:dword:0x60000000 0x80047EE4:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/RZDP01.ini b/Data/Sys/GameSettings/RZDP01.ini index b30d32a7344..9b11d8311da 100644 --- a/Data/Sys/GameSettings/RZDP01.ini +++ b/Data/Sys/GameSettings/RZDP01.ini @@ -38,5 +38,8 @@ $Hyrule Field Speed Hack 0x80040f90:dword:0x60000000 0x80040fac:dword:0x60000000 +[Patches_RetroAchievements_Verified] +$Hyrule Field Speed Hack + [ActionReplay] # Add action replay cheats here. diff --git a/Data/Sys/GameSettings/SAOE78.ini b/Data/Sys/GameSettings/SAOE78.ini index 190419f79ce..58a248c5797 100644 --- a/Data/Sys/GameSettings/SAOE78.ini +++ b/Data/Sys/GameSettings/SAOE78.ini @@ -7,3 +7,6 @@ $Fix crash on boot 0x803A5F20:dword:0x60000000 [OnFrame_Enabled] $Fix crash on boot + +[Patches_RetroAchievements_Verified] +$Fix crash on boot diff --git a/Data/Sys/GameSettings/SAOEVZ.ini b/Data/Sys/GameSettings/SAOEVZ.ini index a737692c5b5..6ae9aa3970c 100644 --- a/Data/Sys/GameSettings/SAOEVZ.ini +++ b/Data/Sys/GameSettings/SAOEVZ.ini @@ -7,3 +7,6 @@ $Fix crash on boot 0x803A64D0:dword:0x60000000 [OnFrame_Enabled] $Fix crash on boot + +[Patches_RetroAchievements_Verified] +$Fix crash on boot diff --git a/Data/Sys/GameSettings/SGLEA4.ini b/Data/Sys/GameSettings/SGLEA4.ini index 4eb864004e7..8b2094f55ad 100644 --- a/Data/Sys/GameSettings/SGLEA4.ini +++ b/Data/Sys/GameSettings/SGLEA4.ini @@ -6,3 +6,6 @@ # incorrectly, but for now this patch makes the game playable. $Fix black screen 0x801D59AC:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Fix black screen diff --git a/Data/Sys/GameSettings/SGLPA4.ini b/Data/Sys/GameSettings/SGLPA4.ini index f70ade77e35..8651e5eb827 100644 --- a/Data/Sys/GameSettings/SGLPA4.ini +++ b/Data/Sys/GameSettings/SGLPA4.ini @@ -6,3 +6,6 @@ # incorrectly, but for now this patch makes the game playable. $Fix black screen 0x801D59C8:dword:0x60000000 + +[Patches_RetroAchievements_Verified] +$Fix black screen diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp index 7d7c0af3742..1920ad05528 100644 --- a/Source/Core/Core/AchievementManager.cpp +++ b/Source/Core/Core/AchievementManager.cpp @@ -14,6 +14,7 @@ #include #include "Common/Assert.h" +#include "Common/BitUtils.h" #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/IOFile.h" @@ -26,6 +27,7 @@ #include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/HW/VideoInterface.h" +#include "Core/PatchEngine.h" #include "Core/PowerPC/MMU.h" #include "Core/System.h" #include "DiscIO/Blob.h" @@ -70,6 +72,34 @@ void AchievementManager::Init() } } +void AchievementManager::LoadApprovedList() +{ + picojson::value temp; + std::string error; + if (!JsonFromFile(fmt::format("{}{}{}", File::GetSysDirectory(), DIR_SEP, APPROVED_LIST_FILENAME), + &temp, &error)) + { + WARN_LOG_FMT(ACHIEVEMENTS, "Failed to load approved game settings list {}", + APPROVED_LIST_FILENAME); + WARN_LOG_FMT(ACHIEVEMENTS, "Error: {}", error); + return; + } + auto context = Common::SHA1::CreateContext(); + context->Update(temp.serialize()); + auto digest = context->Finish(); + if (digest != APPROVED_LIST_HASH) + { + WARN_LOG_FMT(ACHIEVEMENTS, "Failed to verify approved game settings list {}", + APPROVED_LIST_FILENAME); + WARN_LOG_FMT(ACHIEVEMENTS, "Expected hash {}, found hash {}", + Common::SHA1::DigestToString(APPROVED_LIST_HASH), + Common::SHA1::DigestToString(digest)); + return; + } + std::lock_guard lg{m_lock}; + m_ini_root = std::move(temp); +} + void AchievementManager::SetUpdateCallback(UpdateCallback callback) { m_update_callback = std::move(callback); @@ -322,6 +352,48 @@ bool AchievementManager::IsHardcoreModeActive() const return rc_client_is_processing_required(m_client); } +void AchievementManager::FilterApprovedPatches(std::vector& patches, + const std::string& game_ini_id) const +{ + if (!IsHardcoreModeActive()) + return; + + if (!m_ini_root.contains(game_ini_id)) + patches.clear(); + auto patch_itr = patches.begin(); + while (patch_itr != patches.end()) + { + INFO_LOG_FMT(ACHIEVEMENTS, "Verifying patch {}", patch_itr->name); + + auto context = Common::SHA1::CreateContext(); + context->Update(Common::BitCastToArray(static_cast(patch_itr->entries.size()))); + for (const auto& entry : patch_itr->entries) + { + context->Update(Common::BitCastToArray(entry.type)); + context->Update(Common::BitCastToArray(entry.address)); + context->Update(Common::BitCastToArray(entry.value)); + context->Update(Common::BitCastToArray(entry.comparand)); + context->Update(Common::BitCastToArray(entry.conditional)); + } + auto digest = context->Finish(); + + bool verified = m_ini_root.get(game_ini_id).contains(Common::SHA1::DigestToString(digest)); + if (!verified) + { + patch_itr = patches.erase(patch_itr); + OSD::AddMessage( + fmt::format("Failed to verify patch {} from file {}.", patch_itr->name, game_ini_id), + OSD::Duration::VERY_LONG, OSD::Color::RED); + OSD::AddMessage("Disable hardcore mode to enable this patch.", OSD::Duration::VERY_LONG, + OSD::Color::RED); + } + else + { + patch_itr++; + } + } +} + void AchievementManager::SetSpectatorMode() { rc_client_set_spectator_mode_enabled(m_client, Config::Get(Config::RA_SPECTATOR_ENABLED)); diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h index 39960030408..efddd003a98 100644 --- a/Source/Core/Core/AchievementManager.h +++ b/Source/Core/Core/AchievementManager.h @@ -27,6 +27,7 @@ #include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/HttpRequest.h" +#include "Common/JsonUtil.h" #include "Common/WorkQueueThread.h" #include "DiscIO/Volume.h" #include "VideoCommon/Assets/CustomTextureData.h" @@ -37,6 +38,11 @@ class CPUThreadGuard; class System; } // namespace Core +namespace PatchEngine +{ +struct Patch; +} // namespace PatchEngine + class AchievementManager { public: @@ -60,6 +66,10 @@ public: static constexpr std::string_view GRAY = "transparent"; static constexpr std::string_view GOLD = "#FFD700"; 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}; struct LeaderboardEntry { @@ -109,6 +119,9 @@ public: std::recursive_mutex& GetLock(); void SetHardcoreMode(); bool IsHardcoreModeActive() const; + void SetGameIniId(const std::string& game_ini_id) { m_game_ini_id = game_ini_id; } + void FilterApprovedPatches(std::vector& patches, + const std::string& game_ini_id) const; void SetSpectatorMode(); std::string_view GetPlayerDisplayName() const; u32 GetPlayerScore() const; @@ -132,7 +145,7 @@ public: void Shutdown(); private: - AchievementManager() = default; + AchievementManager() { LoadApprovedList(); }; struct FilereaderState { @@ -140,6 +153,8 @@ private: std::unique_ptr volume; }; + void LoadApprovedList(); + static void* FilereaderOpenByFilepath(const char* path_utf8); static void* FilereaderOpenByVolume(const char* path_utf8); static void FilereaderSeek(void* file_handle, int64_t offset, int origin); @@ -211,6 +226,9 @@ private: std::chrono::steady_clock::time_point m_last_rp_time = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point m_last_progress_message = std::chrono::steady_clock::now(); + picojson::value m_ini_root; + std::string m_game_ini_id; + std::unordered_map m_leaderboard_map; bool m_challenges_updated = false; std::unordered_set m_active_challenges; diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp index f020c754eb3..0728637e470 100644 --- a/Source/Core/Core/PatchEngine.cpp +++ b/Source/Core/Core/PatchEngine.cpp @@ -182,6 +182,13 @@ void LoadPatches() LoadPatchSection("OnFrame", &s_on_frame, globalIni, localIni); +#ifdef USE_RETRO_ACHIEVEMENTS + { + std::lock_guard lg{AchievementManager::GetInstance().GetLock()}; + AchievementManager::GetInstance().FilterApprovedPatches(s_on_frame, sconfig.GetGameID()); + } +#endif // USE_RETRO_ACHIEVEMENTS + // Check if I'm syncing Codes if (Config::Get(Config::SESSION_CODE_SYNC_OVERRIDE)) { @@ -197,9 +204,6 @@ void LoadPatches() static void ApplyPatches(const Core::CPUThreadGuard& guard, const std::vector& patches) { - if (AchievementManager::GetInstance().IsHardcoreModeActive()) - return; - for (const Patch& patch : patches) { if (patch.enabled)