From 8e8598412d98575f2aedfb6dffac9bc5014dfe2a Mon Sep 17 00:00:00 2001
From: lightningterror <lightningterror@yahoo.com>
Date: Sat, 23 Feb 2019 06:52:40 +0100
Subject: [PATCH] gsdx: Purge all crc hacks for GSC_OnePieceGrandAdventure and
 GSC_OnePieceGrandBattle.

Texture shuffle and hdr colclip.
Effects rendered correctly.
---
 plugins/GSdx/GSCrc.cpp                 |  9 ---------
 plugins/GSdx/GSCrc.h                   |  2 --
 plugins/GSdx/Renderers/HW/GSHwHack.cpp | 28 --------------------------
 3 files changed, 39 deletions(-)

diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp
index f617fcae9f..2e4d796867 100644
--- a/plugins/GSdx/GSCrc.cpp
+++ b/plugins/GSdx/GSCrc.cpp
@@ -122,15 +122,6 @@ CRC::Game CRC::m_games[] =
 	{0x877F3436, SoTC, JP, 0},
 	{0xA17D6AAA, SoTC, KO, 0},
 	{0x877B3D35, SoTC, CH, 0},
-	{0x3122B508, OnePieceGrandAdventure, US, 0},
-	{0x8DF14A24, OnePieceGrandAdventure, EU, 0},
-	{0xE446C9F9, OnePieceGrandAdventure, KO, 0},
-	{0xCA2073B3, OnePieceGrandBattle, KO, 0},
-	{0x66953267, OnePieceGrandAdventure, JP, 0},
-	{0xE1674F57, OnePieceGrandBattle, EU, 0},
-	{0x947B933B, OnePieceGrandAdventure, US, 0},
-	{0xB049DD5E, OnePieceGrandBattle, US, 0},
-	{0x5D02CC5B, OnePieceGrandBattle, NoRegion, 0},
 	{0x6F8545DB, ICO, US, 0},
 	{0x48CDF317, ICO, US, 0}, // Demo
 	{0xB01A4C95, ICO, JP, 0},
diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h
index 362ab6a8c9..dc4e828996 100644
--- a/plugins/GSdx/GSCrc.h
+++ b/plugins/GSdx/GSCrc.h
@@ -106,8 +106,6 @@ public:
 		NicktoonsUnite,
 		Okami,
 		Oneechanbara2Special,
-		OnePieceGrandAdventure,
-		OnePieceGrandBattle,
 		Onimusha3,
 		PiaCarroteYoukosoGPGakuenPrincess,
 		Quake3Revolution,
diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
index 78f9d78ac6..fecb4948e8 100644
--- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp
+++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp
@@ -1123,32 +1123,6 @@ bool GSC_Okami(const GSFrameInfo& fi, int& skip)
 	return true;
 }
 
-bool GSC_OnePieceGrandAdventure(const GSFrameInfo& fi, int& skip)
-{
-	if(skip == 0)
-	{
-		if(fi.TME && fi.FBP == 0x02d00 && fi.FPSM == PSM_PSMCT16 && (fi.TBP0 == 0x00000 || fi.TBP0 == 0x00e00 || fi.TBP0 == 0x00f00) && fi.TPSM == PSM_PSMCT16)
-		{
-			skip = 4;
-		}
-	}
-
-	return true;
-}
-
-bool GSC_OnePieceGrandBattle(const GSFrameInfo& fi, int& skip)
-{
-	if(skip == 0)
-	{
-		if(fi.TME && fi.FBP == 0x02d00 && fi.FPSM == PSM_PSMCT16 && (fi.TBP0 == 0x00000 || fi.TBP0 == 0x00f00) && fi.TPSM == PSM_PSMCT16)
-		{
-			skip = 4;
-		}
-	}
-
-	return true;
-}
-
 bool GSC_StarOcean3(const GSFrameInfo& fi, int& skip)
 {
 	// The game emulate a stencil buffer with the alpha channel of the RT
@@ -1843,8 +1817,6 @@ void GSState::SetupCrcHack()
 		lut[CRC::CrashNburn] = GSC_CrashNburn; // seem to be a basic depth effect
 
 		// Those games might requires accurate fbmask
-		lut[CRC::OnePieceGrandAdventure] = GSC_OnePieceGrandAdventure;
-		lut[CRC::OnePieceGrandBattle] = GSC_OnePieceGrandBattle;
 		lut[CRC::Sly2] = GSC_SlyGames; // + Upscaling issue
 		lut[CRC::Sly3] = GSC_SlyGames; // + Upscaling issue