From 6ea7777a3a5a38b022569d47c609d69b9cae11f4 Mon Sep 17 00:00:00 2001 From: Mrlinkwii Date: Wed, 15 Feb 2023 14:56:53 +0000 Subject: [PATCH] GS-HW: remove Fighting Beauty Wulong & Spartan Total Warrior CRC (#8158) --- bin/resources/GameIndex.yaml | 13 ++--------- pcsx2/GS/Renderers/HW/GSHwHack.cpp | 36 ------------------------------ pcsx2/GS/Renderers/HW/GSHwHack.h | 2 -- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml index 54e4ccde74..d0d81eec5e 100644 --- a/bin/resources/GameIndex.yaml +++ b/bin/resources/GameIndex.yaml @@ -9425,8 +9425,6 @@ SLED-53732: region: "PAL" gameFixes: - EETimingHack # Fixes garbage textures flashing on the character model. - gsHWFixes: - getSkipCount: "GSC_Spartan" SLED-53745: name: "Total Overdose [Demo]" region: "PAL-M5" @@ -17087,15 +17085,11 @@ SLES-53393: compat: 5 gameFixes: - EETimingHack # Fixes garbage textures flashing on the character model. - gsHWFixes: - getSkipCount: "GSC_Spartan" SLES-53396: name: "Spartan - Total Warrior" region: "PAL-M3" gameFixes: - EETimingHack # Fixes garbage textures flashing on the character model. - gsHWFixes: - getSkipCount: "GSC_Spartan" SLES-53398: name: "Zombie Zone" region: "PAL-E" @@ -32781,8 +32775,6 @@ SLPM-66444: region: "NTSC-J" gameFixes: - EETimingHack # Fixes garbage textures flashing on the character model. - gsHWFixes: - getSkipCount: "GSC_Spartan" SLPM-66445: name: "Persona 3" region: "NTSC-J" @@ -39219,7 +39211,8 @@ SLPS-25657: region: "NTSC-J" compat: 5 gsHWFixes: - getSkipCount: "GSC_FightingBeautyWulong" + autoFlush: 1 # Helps ghosting. + halfPixelOffset: 2 # Helps ghosting when upscaling. SLPS-25658: name: "Binchou-Tan - Shiwase Goyomi [Shokai Genteiban]" region: "NTSC-J" @@ -46534,8 +46527,6 @@ SLUS-21212: compat: 5 gameFixes: - EETimingHack # Fixes garbage textures flashing on the character model. - gsHWFixes: - getSkipCount: "GSC_Spartan" SLUS-21213: name: "Madden NFL '06" region: "NTSC-U" diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.cpp b/pcsx2/GS/Renderers/HW/GSHwHack.cpp index 6e0204fc8f..caf4a956d9 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp +++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp @@ -170,25 +170,6 @@ bool GSHwHack::GSC_SacredBlaze(GSRendererHW& r, const GSFrameInfo& fi, int& skip return true; } -bool GSHwHack::GSC_Spartan(GSRendererHW& r, const GSFrameInfo& fi, int& skip) -{ - if (skip == 0) - { - if (fi.TME) - { - // depth textures (bully, mgs3s1 intro, Front Mission 5) - if ((fi.TPSM == PSM_PSMZ32 || fi.TPSM == PSM_PSMZ24 || fi.TPSM == PSM_PSMZ16 || fi.TPSM == PSM_PSMZ16S) || - // General, often problematic post processing - (GSUtil::HasSharedBits(fi.FBP, fi.FPSM, fi.TBP0, fi.TPSM))) - { - skip = 2; - } - } - } - - return true; -} - bool GSHwHack::GSC_Oneechanbara2Special(GSRendererHW& r, const GSFrameInfo& fi, int& skip) { if (skip == 0) @@ -499,21 +480,6 @@ bool GSHwHack::GSC_SakuraWarsSoLongMyLove(GSRendererHW& r, const GSFrameInfo& fi return true; } -bool GSHwHack::GSC_FightingBeautyWulong(GSRendererHW& r, const GSFrameInfo& fi, int& skip) -{ - if (skip == 0) - { - if (!s_nativeres && fi.TME && (fi.TBP0 == 0x0700 || fi.TBP0 == 0x0a80) && (fi.TPSM == PSM_PSMCT32 || fi.TPSM == PSM_PSMCT24)) - { - // Don't enable hack on native res if crc is below aggressive. - // removes glow/blur which cause ghosting and other sprite issues similar to Tekken 5 - skip = 1; - } - } - - return true; -} - bool GSHwHack::GSC_GodHand(GSRendererHW& r, const GSFrameInfo& fi, int& skip) { if (skip == 0) @@ -1258,7 +1224,6 @@ const GSHwHack::Entry GSHwHack::s_get_skip_count_function // Channel Effect CRC_F(GSC_CrashBandicootWoC, CRCHackLevel::Partial), CRC_F(GSC_GiTS, CRCHackLevel::Partial), - CRC_F(GSC_Spartan, CRCHackLevel::Partial), CRC_F(GSC_SteambotChronicles, CRCHackLevel::Partial), // Depth Issue @@ -1272,7 +1237,6 @@ const GSHwHack::Entry GSHwHack::s_get_skip_count_function CRC_F(GSC_DeathByDegreesTekkenNinaWilliams, CRCHackLevel::Partial), // + Upscaling issues // Upscaling hacks - CRC_F(GSC_FightingBeautyWulong, CRCHackLevel::Partial), CRC_F(GSC_Oneechanbara2Special, CRCHackLevel::Partial), CRC_F(GSC_UltramanFightingEvolution, CRCHackLevel::Partial), CRC_F(GSC_YakuzaGames, CRCHackLevel::Partial), diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.h b/pcsx2/GS/Renderers/HW/GSHwHack.h index c9b0a5b405..f2c4739b8e 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.h +++ b/pcsx2/GS/Renderers/HW/GSHwHack.h @@ -24,7 +24,6 @@ public: static bool GSC_Manhunt2(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_CrashBandicootWoC(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_SacredBlaze(GSRendererHW& r, const GSFrameInfo& fi, int& skip); - static bool GSC_Spartan(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_Oneechanbara2Special(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_SakuraTaisen(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_SFEX3(GSRendererHW& r, const GSFrameInfo& fi, int& skip); @@ -39,7 +38,6 @@ public: static bool GSC_Kunoichi(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_ZettaiZetsumeiToshi2(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_SakuraWarsSoLongMyLove(GSRendererHW& r, const GSFrameInfo& fi, int& skip); - static bool GSC_FightingBeautyWulong(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_GodHand(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_KnightsOfTheTemple2(GSRendererHW& r, const GSFrameInfo& fi, int& skip); static bool GSC_UltramanFightingEvolution(GSRendererHW& r, const GSFrameInfo& fi, int& skip);