diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp index 151f6b0382..2b88681b04 100644 --- a/plugins/GSdx/GSCrc.cpp +++ b/plugins/GSdx/GSCrc.cpp @@ -396,8 +396,6 @@ CRC::Game CRC::m_games[] = {0x879CDA5E, StarWarsForceUnleashed, US, 0}, {0x137C792E, StarWarsForceUnleashed, US, 0}, {0xDAF2145C, StarWarsForceUnleashed, EU, 0}, - {0x503BF9E1, StarWarsBattlefront, NoRegion, 0}, // EU and US versions have the same CRC - {0x02F4B541, StarWarsBattlefront2, NoRegion, 0}, // EU and US versions have the same CRC {0xA8DB29DF, BlackHawkDown, EU, 0}, {0x25FC361B, DevilMayCry3, US, 0}, // SE {0x2F7D8AD5, DevilMayCry3, US, 0}, diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h index 6295ab177d..41563320e2 100644 --- a/plugins/GSdx/GSCrc.h +++ b/plugins/GSdx/GSCrc.h @@ -150,8 +150,6 @@ public: SpyroEternalNight, SpyroNewBeginning, StarOcean3, - StarWarsBattlefront, - StarWarsBattlefront2, StarWarsForceUnleashed, SteambotChronicles, SuikodenTactics, diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp index 9bb45589cb..838ad2a072 100644 --- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp +++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp @@ -1141,36 +1141,6 @@ bool GSC_DeathByDegreesTekkenNinaWilliams(const GSFrameInfo& fi, int& skip) return true; } -bool GSC_StarWarsBattlefront(const GSFrameInfo& fi, int& skip) -{ - if(skip == 0) - { - if(fi.TME && (fi.FBP > 0x0 && fi.FBP < 0x01000) && fi.FPSM == PSM_PSMCT32 && (fi.TBP0 > 0x02000 && fi.TBP0 < 0x03000) && fi.TPSM == PSM_PSMT8) - { - skip = 1; - } - } - - return true; -} - -bool GSC_StarWarsBattlefront2(const GSFrameInfo& fi, int& skip) -{ - if(skip == 0) - { - if(fi.TME && (fi.FBP > 0x01000 && fi.FBP < 0x02000) && fi.FPSM == PSM_PSMCT32 && (fi.TBP0 > 0x0 && fi.TBP0 < 0x01000) && fi.TPSM == PSM_PSMT8) - { - skip = 1; - } - if(fi.TME && (fi.FBP > 0x01000 && fi.FBP < 0x02000) && fi.FPSM == PSM_PSMZ32 && (fi.TBP0 > 0x0 && fi.TBP0 < 0x01000) && fi.TPSM == PSM_PSMT8) - { - skip = 1; - } - } - - return true; -} - bool GSC_Okami(const GSFrameInfo& fi, int& skip) { if(skip == 0) @@ -2148,8 +2118,6 @@ void GSState::SetupCrcHack() // Channel Effect lut[CRC::DeathByDegreesTekkenNinaWilliams] = GSC_DeathByDegreesTekkenNinaWilliams; lut[CRC::MetalGearSolid3] = GSC_MetalGearSolid3; // + accurate blending - lut[CRC::StarWarsBattlefront] = GSC_StarWarsBattlefront; - lut[CRC::StarWarsBattlefront2] = GSC_StarWarsBattlefront2; // Dedicated shader for channel effect lut[CRC::TalesOfAbyss] = GSC_TalesOfAbyss;