diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp index e03dba22f9..8658dabe8d 100644 --- a/plugins/GSdx/GSCrc.cpp +++ b/plugins/GSdx/GSCrc.cpp @@ -333,13 +333,6 @@ CRC::Game CRC::m_games[] = {0x90F0D852, BigMuthaTruckers, US, 0}, {0x5CC9BF81, TimeSplitters2, EU, 0}, {0x12532F1C, TimeSplitters2, US, 0}, - {0xC818BEC2, LordOfTheRingsTwoTowers, US, 0}, - {0xDC43F2B8, LordOfTheRingsTwoTowers, EU, 0}, - {0x9ABF90FB, LordOfTheRingsTwoTowers, ES, 0}, - {0x5FF407EE, LordOfTheRingsTwoTowers, IT, 0}, - {0xC0E909E9, LordOfTheRingsTwoTowers, JP, 0}, - {0x6898435D, LordOfTheRingsTwoTowers, KO, 0}, - {0xDC2F9B98, LordOfTheRingsTwoTowers, CH, 0}, // cutie comment {0xEB198738, LordOfTheRingsThirdAge, US, 0}, {0x614F4CF4, LordOfTheRingsThirdAge, EU, 0}, {0x37CD4279, LordOfTheRingsThirdAge, KO, 0}, @@ -367,9 +360,9 @@ CRC::Game CRC::m_games[] = {0x2BE55519, EternalPoison, US, 0}, {0xE01F57EC, LegoBatman, US, 0}, // cutie comment {0xE01F57ED, LegoBatman, EU, 0}, - {0xE0347841, XE3, JP, 0}, // cutie comment - {0xA4E88698, XE3, CH, 0}, - {0x2088950A, XE3, US, 0}, + {0xE0347841, XenosagaE3, JP, 0}, // cutie comment + {0xA4E88698, XenosagaE3, CH, 0}, + {0x2088950A, XenosagaE3, US, 0}, // DMC(1)? {0x79B8A95F, DevilMayCry3, US, 0}, {0x7F3D692D, DevilMayCry3, CH, 0}, // {0x1A85E924, DevilMayCry3, CH, 0}, // same CRC as {GodOfWar, NoRegion} diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h index 275fdaf9cb..3d609e6ea3 100644 --- a/plugins/GSdx/GSCrc.h +++ b/plugins/GSdx/GSCrc.h @@ -100,7 +100,6 @@ public: LegacyOfKainDefiance, LegoBatman, LordOfTheRingsThirdAge, - LordOfTheRingsTwoTowers, MajokkoALaMode2, Manhunt2, MetalGearSolid3, @@ -173,7 +172,7 @@ public: Whiplash, WildArms4, WildArms5, - XE3, + XenosagaE3, Yakuza, Yakuza2, ZettaiZetsumeiToshi2, diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp index c4e30e65ac..27b25d8560 100644 --- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp +++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp @@ -1448,30 +1448,6 @@ bool GSC_Sly2(const GSFrameInfo& fi, int& skip) return true; } -bool GSC_LordOfTheRingsTwoTowers(const GSFrameInfo& fi, int& skip) -{ - if(skip == 0) - { - if(fi.TME && (fi.FBP == 0x01180 || fi.FBP == 0x01400) && fi.FPSM == fi.TPSM && (fi.TBP0 == 0x00000 || fi.TBP0 == 0x01000) && fi.TPSM == PSM_PSMCT16) - { - skip = 1000;//shadows - } - else if(fi.TME && fi.TPSM == PSM_PSMZ16 && fi.TBP0 == 0x01400 && fi.FPSM == PSM_PSMCT16 && fi.FBMSK == 0x03FFF) - { - skip = 3; //wall of fog - } - } - else - { - if(fi.TME && (fi.FBP == 0x00000 || fi.FBP == 0x01000) && (fi.TBP0 == 0x01180 || fi.TBP0 == 0x01400) && fi.FPSM == PSM_PSMCT32) - { - skip = 2; - } - } - - return true; -} - bool GSC_CastlevaniaGames(const GSFrameInfo& fi, int& skip) { if(skip == 0) @@ -1541,7 +1517,7 @@ bool GSC_CrashNburn(const GSFrameInfo& fi, int& skip) return true; } -bool GSC_XE3(const GSFrameInfo& fi, int& skip) +bool GSC_XenosagaE3(const GSFrameInfo& fi, int& skip) { if(skip == 0) { @@ -2051,10 +2027,9 @@ void GSState::SetupCrcHack() lut[CRC::Bully] = GSC_Bully; lut[CRC::BullyCC] = GSC_BullyCC; lut[CRC::GodOfWar2] = GSC_GodOfWar2; - lut[CRC::LordOfTheRingsTwoTowers] = GSC_LordOfTheRingsTwoTowers; lut[CRC::Okami] = GSC_Okami; lut[CRC::SuikodenTactics] = GSC_SuikodenTactics; - lut[CRC::XE3] = GSC_XE3; + lut[CRC::XenosagaE3] = GSC_XenosagaE3; lut[CRC::Yakuza] = GSC_YakuzaGames; lut[CRC::Yakuza2] = GSC_YakuzaGames; @@ -2077,7 +2052,7 @@ void GSState::SetupCrcHack() lut[CRC::CastlevaniaLoI] = GSC_CastlevaniaGames; lut[CRC::GodOfWar] = GSC_GodOfWar; - // Deprecated hack could be removed (Cutie) + // Unknown status lut[CRC::Grandia3] = GSC_Grandia3; // At least a part of the CRC is fixed with texture shuffle.