From f6e12f82de7fbdb15ccbf574eb8552fb54c47ac2 Mon Sep 17 00:00:00 2001
From: lightningterror <18107717+lightningterror@users.noreply.github.com>
Date: Sun, 14 Mar 2021 21:19:02 +0100
Subject: [PATCH] gsdx-hw: Remove Bully crc hack.

Hack breaks a bunch of effects, upscaling issues can be fixed with
texture offset hw hack.
---
 plugins/GSdx/GSCrc.cpp                 |  3 ---
 plugins/GSdx/GSCrc.h                   |  1 -
 plugins/GSdx/Renderers/HW/GSHwHack.cpp | 17 -----------------
 3 files changed, 21 deletions(-)

diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp
index 90245f0674..e47f270303 100644
--- a/plugins/GSdx/GSCrc.cpp
+++ b/plugins/GSdx/GSCrc.cpp
@@ -99,9 +99,6 @@ CRC::Game CRC::m_games[] =
 	{0x71521863, SFEX3, US, 0},
 	{0x63642E9F, SFEX3, JP, 0},
 	{0xCA1F6E53, SFEX3, JP, 0}, // Taikenban Disc (Demo/Trial)
-	{0x28703748, Bully, US, 0},
-	{0x019CFA48, Bully, JP, 0},
-	{0xC78A495D, Bully, EU, 0}, // BullyCC
 	{0xC19A374E, SoTC, US, 0},
 	{0x7D8F539A, SoTC, EU, 0},
 	{0x0F0C4A9C, SoTC, EU, 0},
diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h
index efd585888f..d27a098967 100644
--- a/plugins/GSdx/GSCrc.h
+++ b/plugins/GSdx/GSCrc.h
@@ -35,7 +35,6 @@ public:
 		Barnyard,
 		BigMuthaTruckers,
 		BrianLaraInternationalCricket,
-		Bully,
 		BurnoutDominator,
 		BurnoutRevenge,
 		BurnoutTakedown,
diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
index 83b6ca80f4..c8c8350146 100644
--- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp
+++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
@@ -56,22 +56,6 @@ bool GSC_BigMuthaTruckers(const GSFrameInfo& fi, int& skip)
 	return true;
 }
 
-bool GSC_Bully(const GSFrameInfo& fi, int& skip)
-{
-	if (skip == 0)
-	{
-		if ((Aggressive || !s_nativeres) && !fi.TME && (fi.FBP == 0x02300 || fi.FBP == 0x02800) && fi.FPSM == PSM_PSMCT24)
-		{
-			// ntsc 0x02300, pal 0x02800
-			// Don't enable hack on native res if crc is below aggressive.
-			// Previous value 6, ntsc didn't like it.
-			skip = 8; // Upscaling blur/ghosting
-		}
-	}
-
-	return true;
-}
-
 bool GSC_DBZBT3(const GSFrameInfo& fi, int& skip)
 {
 	if (skip == 0)
@@ -1090,7 +1074,6 @@ void GSState::SetupCrcHack()
 		lut[CRC::DeathByDegreesTekkenNinaWilliams] = GSC_DeathByDegreesTekkenNinaWilliams; // + Upscaling issues
 
 		// Upscaling hacks
-		lut[CRC::Bully] = GSC_Bully;
 		lut[CRC::DBZBT3] = GSC_DBZBT3;
 		lut[CRC::EvangelionJo] = GSC_EvangelionJo;
 		lut[CRC::FightingBeautyWulong] = GSC_FightingBeautyWulong;