diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp index 66538e3e15..ef81c987a3 100644 --- a/plugins/GSdx/GSCrc.cpp +++ b/plugins/GSdx/GSCrc.cpp @@ -199,6 +199,7 @@ CRC::Game CRC::m_games[] = {0xE23D532B, GodOfWar, NoRegion, 0}, {0x1A85E924, GodOfWar, NoRegion, 0}, // cutie comment {0x608ACBD3, GodOfWar, CH, 0}, // cutie comment + // {0x1A85E924, GodOfWar, NoRegion, 0}, // same CRC as {0x1A85E924, DevilMayCry3, CH, 0} {0x2F123FD8, GodOfWar2, US, 0}, // same CRC as RU {0x44A8A22A, GodOfWar2, EU, 0}, {0x60BC362B, GodOfWar2, EU, 0}, @@ -219,10 +220,6 @@ CRC::Game CRC::m_games[] = {0xA3643EB1, GiTS, KO, 0}, {0x28557423, GiTS, RU, 0}, {0xBF6F101F, GiTS, EU, 0}, // same CRC as another US disc - {0x6BF11378, Onimusha3, US, 0}, - {0x78F1136A, Onimusha3, RU, 0}, // Unofficial RU-version - {0x71320CA8, Onimusha3, JP, 0}, - {0xDAFFFB0D, Onimusha3, KO, 0}, {0xF442260C, MajokkoALaMode2, JP, 0}, {0xA616A6C2, TalesOfAbyss, US, 0}, {0x14FE77F7, TalesOfAbyss, US, 0}, @@ -343,18 +340,6 @@ CRC::Game CRC::m_games[] = {0xCC9BFDE3, StarWarsForceUnleashed, JP, 0}, {0xDAF2145C, StarWarsForceUnleashed, EU, 0}, {0x87109051, StarWarsForceUnleashed, EU, 0}, - // {0x79B8A95F, DevilMayCry3, US, 0}, // DMC(1)? - // {0x1A85E924, DevilMayCry3, CH, 0}, // same CRC as {GodOfWar, NoRegion} - {0x7F3D692D, DevilMayCry3, CH, 0}, - {0x25FC361B, DevilMayCry3, US, 0}, // SE - {0x2F7D8AD5, DevilMayCry3, US, 0}, - {0x0BED0AF9, DevilMayCry3, US, 0}, - {0x18C9343F, DevilMayCry3, EU, 0}, // SE - {0x7ADCB24A, DevilMayCry3, EU, 0}, - {0x79C952B0, DevilMayCry3, JP, 0}, // SE - {0x7F3DDEAB, DevilMayCry3, JP, 0}, - {0x05931990, DevilMayCry3, KO, 0}, - {0x4AD36D59, DevilMayCry3, RU, 0}, {0xBEBF8793, BurnoutTakedown, US, 0}, {0xBB2E845F, BurnoutTakedown, JP, 0}, {0x5F060991, BurnoutTakedown, KO, 0}, diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h index c865caec0d..30891aeaea 100644 --- a/plugins/GSdx/GSCrc.h +++ b/plugins/GSdx/GSCrc.h @@ -48,7 +48,6 @@ public: DeathByDegreesTekkenNinaWilliams, DestroyAllHumans, DestroyAllHumans2, - DevilMayCry3, DuelSaviorDestiny, EvangelionJo, FFX, @@ -98,7 +97,6 @@ public: NicktoonsUnite, Okami, Oneechanbara2Special, - Onimusha3, Persona3, PiaCarroteYoukosoGPGakuenPrincess, ProjectSnowblind, diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp index 4315bea6b2..ad7d6a1eeb 100644 --- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp +++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp @@ -294,16 +294,6 @@ bool GSC_IkkiTousen(const GSFrameInfo& fi, int& skip) return true; } -bool GSC_Onimusha3(const GSFrameInfo& fi, int& skip) -{ - if(fi.TME /*&& (fi.FBP == 0x00000 || fi.FBP == 0x00700)*/ && (fi.TBP0 == 0x01180 || fi.TBP0 == 0x00e00 || fi.TBP0 == 0x01000 || fi.TBP0 == 0x01200) && (fi.TPSM == PSM_PSMCT32 || fi.TPSM == PSM_PSMCT24)) - { - skip = 1; - } - - return true; -} - bool GSC_Genji(const GSFrameInfo& fi, int& skip) { if(skip == 0) @@ -535,28 +525,6 @@ bool GSC_TombRaiderUnderWorld(const GSFrameInfo& fi, int& skip) return true; } -bool GSC_DevilMayCry3(const GSFrameInfo& fi, int& skip) -{ - if(skip == 0) - { - if(fi.TME && fi.FBP == 0x01800 && fi.FPSM == PSM_PSMCT16 && fi.TBP0 == 0x01000 && fi.TPSM == PSM_PSMZ16) - { - // Texture shuffle/depth not handled properly. - skip = 32; - } - if(fi.TME && fi.FBP == 0x01800 && fi.FPSM == PSM_PSMZ32 && fi.TBP0 == 0x0800 && fi.TPSM == PSM_PSMT8H) - { - skip = 16; - } - if(fi.TME && fi.FBP == 0x01800 && fi.FPSM == PSM_PSMCT32 && fi.TBP0 == 0x0 && fi.TPSM == PSM_PSMT8H) - { - skip = 24; - } - } - - return true; -} - bool GSC_BurnoutGames(const GSFrameInfo& fi, int& skip) { if(skip == 0) @@ -1396,13 +1364,11 @@ void GSState::SetupCrcHack() if (Dx_and_OGL) { lut[CRC::CrashBandicootWoC] = GSC_CrashBandicootWoC; - lut[CRC::DevilMayCry3] = GSC_DevilMayCry3; lut[CRC::GodHand] = GSC_GodHand; lut[CRC::KnightsOfTheTemple2] = GSC_KnightsOfTheTemple2; lut[CRC::Kunoichi] = GSC_Kunoichi; lut[CRC::Manhunt2] = GSC_Manhunt2; lut[CRC::MidnightClub3] = GSC_MidnightClub3; - lut[CRC::Onimusha3] = GSC_Onimusha3; lut[CRC::SacredBlaze] = GSC_SacredBlaze; lut[CRC::SakuraTaisen] = GSC_SakuraTaisen; lut[CRC::SakuraWarsSoLongMyLove] = GSC_SakuraWarsSoLongMyLove;