From b00c603e0bcbe3dc60b8a72ece2e3ddc3a0288c7 Mon Sep 17 00:00:00 2001 From: lightningterror Date: Sun, 19 Jul 2020 00:14:37 +0200 Subject: [PATCH] gsdx-hw: Remove aggressive crc hack for SMTDDS1, SMTDDS2, SMTNocturne. Removed motion blur and filter on the player. Hack is awful, get rid of it! Related https://github.com/PCSX2/pcsx2/commit/4e7e7f2dd5e549183e1a233db3f7a2950ec58326 Bonus: remove commented out hack for VP2. --- plugins/GSdx/GSCrc.cpp | 8 ------- plugins/GSdx/GSCrc.h | 2 -- plugins/GSdx/Renderers/HW/GSHwHack.cpp | 33 -------------------------- plugins/GSdx/Window/GSSetting.cpp | 2 +- 4 files changed, 1 insertion(+), 44 deletions(-) diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp index f3d75159d1..8a85351ee5 100644 --- a/plugins/GSdx/GSCrc.cpp +++ b/plugins/GSdx/GSCrc.cpp @@ -255,14 +255,6 @@ CRC::Game CRC::m_games[] = {0x47BA9034, SMTNocturne, JP, 0}, // SMTNocturne Maniacs Chronicle {0xD3FFC263, SMTNocturne, KO, 0}, {0x84D1A8DA, SMTNocturne, KO, 0}, - {0xD7273511, SMTDDS1, US, 0}, // SMT Digital Devil Saga - {0x1683A6BE, SMTDDS1, EU, 0}, // SMT Digital Devil Saga - {0x44865CE1, SMTDDS1, JP, 0}, // SMT Digital Devil Saga - {0xF2E397C0, SMTDDS1, KO, 0}, // SMT Digital Devil Saga - {0x43202D1A, SMTDDS2, KO, 0}, // SMT Digital Devil Saga 2 - {0xD382C164, SMTDDS2, US, 0}, // SMT Digital Devil Saga 2 - {0xD568B684, SMTDDS2, EU, 0}, // SMT Digital Devil Saga 2 - {0xE47C1A9C, SMTDDS2, JP, 0}, // SMT Digital Devil Saga 2 {0x0B8AB37B, RozenMaidenGebetGarden, JP, 0}, {0xA33AF77A, TenchuFS, US, 0}, {0x64C58FB4, TenchuFS, US, 0}, diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h index 2e503a824a..a2673dc9d6 100644 --- a/plugins/GSdx/GSCrc.h +++ b/plugins/GSdx/GSCrc.h @@ -121,8 +121,6 @@ public: SkyGunner, Sly2, Sly3, - SMTDDS1, - SMTDDS2, SMTNocturne, SonicUnleashed, SoTC, diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp index ad7d6a1eeb..b09f6a17f7 100644 --- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp +++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp @@ -910,14 +910,6 @@ bool GSC_ValkyrieProfile2(const GSFrameInfo& fi, int& skip) { if(skip == 0) { - /*if(fi.TME && (fi.FBP == 0x018c0 || fi.FBP == 0x02180) && fi.FPSM == fi.TPSM && fi.TBP0 >= 0x03200 && fi.TPSM == PSM_PSMCT32) //NTSC only, !(fi.TBP0 == 0x03580 || fi.TBP0 == 0x03960) - { - skip = 1; //red garbage in lost forest, removes other effects... - } - if(fi.TME && fi.FPSM == fi.TPSM && fi.TPSM == PSM_PSMCT16 && fi.FBMSK == 0x03FFF) - { - skip = 1; // //garbage in cutscenes, doesn't remove completely. - }*/ if(fi.TME && fi.FBP == fi.TBP0 && fi.FPSM == PSM_PSMCT32 && fi.TPSM == PSM_PSMT4HH) { // GH: Hack is quite similar to GSC_StarOcean3. It is potentially the same issue. @@ -1068,28 +1060,6 @@ bool GSC_GodOfWar(const GSFrameInfo& fi, int& skip) return true; } -template -bool GSC_SMTNocturneDDS(const GSFrameInfo& fi, int& skip) -{ - // stop the motion blur on the main character and - // smudge filter from being drawn on USA versions of - // Nocturne, Digital Devil Saga 1 and Digital Devil Saga 2 - - if(g_crc_region == CRC::US && skip == 0 && fi.TBP0 == 0xE00 && fi.TME) - { - // Note: it will crash if the core doesn't allocate the EE mem in 0x2000_0000 (unlikely but possible) - // Aggressive hacks are evil anyway - - // Nocturne: - // -0x5900($gp), ref at 0x100740 - const int state = *(int*)(state_addr); - if (state == 23 || state == 24 || state == 25) - skip = 1; - } - - return true; -} - bool GSC_SoTC(const GSFrameInfo& fi, int& skip) { // Not needed anymore? What did it fix anyway? (rama) @@ -1452,9 +1422,6 @@ void GSState::SetupCrcHack() lut[CRC::FFXII] = GSC_FFXGames; lut[CRC::RedDeadRevolver] = GSC_RedDeadRevolver; lut[CRC::ShinOnimusha] = GSC_ShinOnimusha; - lut[CRC::SMTDDS1] = GSC_SMTNocturneDDS<0x203BA820>; - lut[CRC::SMTDDS2] = GSC_SMTNocturneDDS<0x20435BF0>; - lut[CRC::SMTNocturne] = GSC_SMTNocturneDDS<0x2054E870>; lut[CRC::SoTC] = GSC_SoTC; lut[CRC::XenosagaE3] = GSC_XenosagaE3; diff --git a/plugins/GSdx/Window/GSSetting.cpp b/plugins/GSdx/Window/GSSetting.cpp index 30d78b388f..57389456b7 100644 --- a/plugins/GSdx/Window/GSSetting.cpp +++ b/plugins/GSdx/Window/GSSetting.cpp @@ -58,7 +58,7 @@ const char* dialog_message(int ID, bool* updateText) { "Full:\nFor an optimal experience with Direct3D.\n\n" "Aggressive:\nUse more aggressive CRC hacks.\n" "Removes effects in some games which make the image appear sharper/clearer.\n" - "Affected games: AC4, BleachBB, Bully, DBZBT 2 & 3, DeathByDegrees, Evangelion, FF games, FightingBeautyWulong, GOW 1 & 2, Kunoichi, IkkiTousen, Okami, Oneechanbara2, OnimushaDoD, RDRevolver, Simple2000Vol114, SoTC, SMT3, SMTDDS 1 & 2, SteambotChronicles, Tekken5, Ultraman, XenosagaE3, Yakuza 1 & 2.\n"; + "Affected games: AC4, BleachBB, Bully, DBZBT 2 & 3, DeathByDegrees, Evangelion, FF games, FightingBeautyWulong, GOW 1 & 2, Kunoichi, IkkiTousen, Okami, Oneechanbara2, OnimushaDoD, RDRevolver, Simple2000Vol114, SoTC, SteambotChronicles, Tekken5, Ultraman, XenosagaE3, Yakuza 1 & 2.\n"; case IDC_SKIPDRAWHACK: case IDC_SKIPDRAWHACKEDIT: case IDC_SKIPDRAWOFFSET: