From 59ecfb23d74cfd645c686b029726180b2f8304e7 Mon Sep 17 00:00:00 2001
From: lightningterror <lightningterror@yahoo.com>
Date: Sun, 23 Dec 2018 17:55:27 +0100
Subject: [PATCH] GSdx: Purge GSC_Bully, GSC_BullyCC crc hacks. It's the same
 game.

Depth and texture shuffle render the effects correctly.

Dump shows the game look splending compared to before on d3d11.
---
 plugins/GSdx/GSCrc.cpp                 |  3 --
 plugins/GSdx/GSCrc.h                   |  2 --
 plugins/GSdx/Renderers/HW/GSHwHack.cpp | 43 --------------------------
 3 files changed, 48 deletions(-)

diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp
index 4e59ad7bc8..ba78a3c14f 100644
--- a/plugins/GSdx/GSCrc.cpp
+++ b/plugins/GSdx/GSCrc.cpp
@@ -113,9 +113,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, BullyCC, EU, 0},
 	{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 6f10f408cd..1c545cf26a 100644
--- a/plugins/GSdx/GSCrc.h
+++ b/plugins/GSdx/GSCrc.h
@@ -37,8 +37,6 @@ public:
 		BlackHawkDown,
 		BleachBladeBattlers,
 		BrianLaraInternationalCricket,
-		Bully,
-		BullyCC,
 		BurnoutDominator,
 		BurnoutRevenge,
 		BurnoutTakedown,
diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
index 9a922ea079..c97c8fb224 100644
--- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp
+++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
@@ -1151,47 +1151,6 @@ bool GSC_Okami(const GSFrameInfo& fi, int& skip)
 	return true;
 }
 
-bool GSC_Bully(const GSFrameInfo& fi, int& skip)
-{
-	if(skip == 0)
-	{
-		if(fi.TME && (fi.FBP == 0x00000 || fi.FBP == 0x01180) && (fi.TBP0 == 0x00000 || fi.TBP0 == 0x01180) && fi.FBP == fi.TBP0 && fi.FPSM == PSM_PSMCT32 && fi.FPSM == fi.TPSM)
-		{
-			return false; // allowed
-		}
-		if(fi.TME && (fi.FBP == 0x00000 || fi.FBP == 0x01180) && fi.FPSM == PSM_PSMCT16S && fi.TBP0 == 0x02300 && fi.TPSM == PSM_PSMZ16S)
-		{
-			skip = 6;
-		}
-	}
-	else
-	{
-		if(!fi.TME && (fi.FBP == 0x00000 || fi.FBP == 0x01180) && fi.FPSM == PSM_PSMCT32)
-		{
-			skip = 0;
-		}
-	}
-
-	return true;
-}
-
-bool GSC_BullyCC(const GSFrameInfo& fi, int& skip)
-{
-	if(skip == 0)
-	{
-		if(fi.TME && (fi.FBP == 0x00000 || fi.FBP == 0x01180) && (fi.TBP0 == 0x00000 || fi.TBP0 == 0x01180) && fi.FBP == fi.TBP0 && fi.FPSM == PSM_PSMCT32 && fi.FPSM == fi.TPSM)
-		{
-			return false; // allowed
-		}
-		if(!fi.TME && fi.FBP == 0x02800 && fi.FPSM == PSM_PSMCT24)
-		{
-			skip = 9;
-		}
-	}
-
-	return true;
-}
-
 bool GSC_OnePieceGrandAdventure(const GSFrameInfo& fi, int& skip)
 {
 	if(skip == 0)
@@ -1984,8 +1943,6 @@ void GSState::SetupCrcHack()
 		lut[CRC::TenchuWoH] = GSC_TenchuGames;
 
 		// Depth
-		lut[CRC::Bully] = GSC_Bully;
-		lut[CRC::BullyCC] = GSC_BullyCC;
 		lut[CRC::GodOfWar2] = GSC_GodOfWar2;
 		lut[CRC::Okami] = GSC_Okami;
 		lut[CRC::XenosagaE3] = GSC_XenosagaE3;