diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml index a05de9a2570bd..2003de1d4e085 100644 --- a/bin/resources/GameIndex.yaml +++ b/bin/resources/GameIndex.yaml @@ -2075,8 +2075,6 @@ SCCS-40022: SCCS-60001: name: "Sakura Taisen - Atsuki Chishio Ni" region: "NTSC-C" - gsHWFixes: - getSkipCount: "GSC_SakuraTaisen" SCCS-60002: name: "Gran Turismo 4 [Review Copy]" region: "NTSC-C" @@ -10930,8 +10928,6 @@ SLAJ-35001: SLAJ-35003: name: "Sakura Taisen - Atsuki Chishio Ni" region: "NTSC-C" - gsHWFixes: - getSkipCount: "GSC_SakuraTaisen" SLAJ-35007: name: "Zhen San Guo Wu Shuang 5 Special" region: "NTSC-C" @@ -27920,8 +27916,6 @@ SLKA-35003: name: "Sakura Taisen - Atsuki Chishioni" region: "NTSC-K" compat: 5 - gsHWFixes: - getSkipCount: "GSC_SakuraTaisen" SLKA-35004: name: "Sakura Wars 5 So Long My Love" region: "NTSC-K" @@ -40053,8 +40047,6 @@ SLPM-67003: name: "Sakura Taisen - Atsuki Chishioni" region: "NTSC-J" compat: 5 - gsHWFixes: - getSkipCount: "GSC_SakuraTaisen" SLPM-67004: name: "Medal of Honor - Rising Sun" region: "NTSC-J" diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.cpp b/pcsx2/GS/Renderers/HW/GSHwHack.cpp index 0c010d122021d..8f00e5330205f 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp +++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp @@ -144,38 +144,6 @@ bool GSHwHack::GSC_SacredBlaze(GSRendererHW& r, int& skip) return true; } -bool GSHwHack::GSC_SakuraTaisen(GSRendererHW& r, int& skip) -{ - if (skip == 0) - { - if (!RTME && (RFBP == 0x0 || RFBP == 0x1180) && (RTBP0 != 0x3fc0 && RTBP0 != 0x3c9a && RTBP0 != 0x3dec /*GSC_TBP0 ==0x38d0 || GSC_TBP0==0x3912 ||GSC_TBP0==0x3bdc ||GSC_TBP0==0x3ab3 ||GSC_TBP0<=0x3a92*/) && RFPSM == PSMCT32 && (RTPSM == PSMT8 || RTPSM == PSMT4) && (RFBMSK == 0x00FFFFFF || !RFBMSK)) - { - skip = 0; //3dec 3fc0 3c9a - } - if (!RTME && (RFBP | RTBP0) != 0 && (RFBP | RTBP0) != 0x1180 && (RFBP | RTBP0) != 0x3be0 && (RFBP | RTBP0) != 0x3c80 && RTBP0 != 0x3c9a && (RFBP | RTBP0) != 0x3d80 && RTBP0 != 0x3dec && RFPSM == PSMCT32 && (RFBMSK == 0)) - { - skip = 0; //3dec 3fc0 3c9a - } - if (!RTME && (RFBP | RTBP0) != 0 && (RFBP | RTBP0) != 0x1180 && (RFBP | RTBP0) != 0x3be0 && (RFBP | RTBP0) != 0x3c80 && (RFBP | RTBP0) != 0x3d80 && RTBP0 != 0x3c9a && RTBP0 != 0x3de && RFPSM == PSMCT32 && (RFBMSK == 0)) - { - skip = 1; //3dec 3fc0 3c9a - } - else if (RTME && (RFBP == 0 || RFBP == 0x1180) && RTBP0 == 0x35B8 && RTPSM == PSMT4) - { - skip = 1; - } - else - { - if (!RTME && (RFBP | RTBP0) == 0x38d0 && RFPSM == PSMCT32) - { - skip = 1; //3dec 3fc0 3c9a - } - } - } - - return true; -} - bool GSHwHack::GSC_SFEX3(GSRendererHW& r, int& skip) { if (skip == 0) @@ -1450,7 +1418,6 @@ const GSHwHack::Entry GSHwHack::s_get_skip_count_function CRC_F(GSC_Manhunt2), CRC_F(GSC_MidnightClub3), CRC_F(GSC_SacredBlaze), - CRC_F(GSC_SakuraTaisen), CRC_F(GSC_SakuraWarsSoLongMyLove), CRC_F(GSC_Simple2000Vol114), CRC_F(GSC_SFEX3), diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.h b/pcsx2/GS/Renderers/HW/GSHwHack.h index 775c813b42a03..29dc121b59954 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.h +++ b/pcsx2/GS/Renderers/HW/GSHwHack.h @@ -22,7 +22,6 @@ class GSHwHack static bool GSC_GiTS(GSRendererHW& r, int& skip); static bool GSC_Manhunt2(GSRendererHW& r, int& skip); static bool GSC_SacredBlaze(GSRendererHW& r, int& skip); - static bool GSC_SakuraTaisen(GSRendererHW& r, int& skip); static bool GSC_SFEX3(GSRendererHW& r, int& skip); static bool GSC_Tekken5(GSRendererHW& r, int& skip); static bool GSC_BurnoutGames(GSRendererHW& r, int& skip);