iR5900: Reset manual protection counters

GameDB: Even more fixes
[ci skip] PAD: Update to latest controller database.
2026-01-31 01:15:24 +01:00 · 2025-02-12 12:12:05 -05:00 · 2025-02-12 12:09:05 -05:00 · 2025-02-10 17:26:03 +01:00 · 2025-02-10 15:06:29 +00:00
6 changed files with 126 additions and 13 deletions
--- a/bin/resources/GameIndex.yaml
+++ b/bin/resources/GameIndex.yaml
@@ -10378,9 +10378,14 @@ SCPS-56016:
  gameFixes:
    - GIFFIFOHack
  gsHWFixes:
+    halfPixelOffset: 2 # Fixes post processing position.
+    nativeScaling: 2 # Fixes post effects.
    estimateTextureRegion: 1 # Improves performance and reduces hash cache size.
    gpuPaletteConversion: 2 # Improves performance and reduces hash cache size.
    autoFlush: 1 # Corrects shadows (Currently still broken even with this).
+    recommendedBlendingLevel: 4 # Fixes car shadows but addeds about 5000 barriers, might impact slower machines.
+    gpuTargetCLUT: 2 # Fixes light flicker.
+    getSkipCount: "GSC_DTGames"
 SCPS-72001:
  name: "GRAN TURISMO3 A-spec [MEGA HITS!]"
  name-sort: "ぐらんつーりすも3 A-spec [MEGA HITS!]"
@@ -12951,6 +12956,7 @@ SLED-50117:
  region: "PAL-E"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -14667,6 +14673,7 @@ SLES-50383:
  compat: 5
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -14676,6 +14683,7 @@ SLES-50384:
  region: "PAL-I"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -14685,6 +14693,7 @@ SLES-50385:
  region: "PAL-S"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -23994,9 +24003,13 @@ SLES-53904:
  clampModes:
    vuClampMode: 0 # Fixes black artifacts on tracks
  gsHWFixes:
+    halfPixelOffset: 2 # Fixes post processing position.
+    nativeScaling: 2 # Fixes post effects.
    estimateTextureRegion: 1 # Improves performance and reduces hash cache size.
    gpuPaletteConversion: 2 # Improves performance and reduces hash cache size.
    autoFlush: 1 # Corrects shadows (Currently still broken even with this).
+    gpuTargetCLUT: 2 # Fixes light flicker.
+    getSkipCount: "GSC_DTGames"
 SLES-53906:
  name: "50 Cent - Bulletproof"
  region: "PAL-F"
@@ -26243,9 +26256,9 @@ SLES-54674:
  compat: 5
  gsHWFixes:
    textureInsideRT: 1 # Needed for post processing effects.
-    halfPixelOffset: 4 # Fixes offset post processing.
+    halfPixelOffset: 2 # Fixes offset post processing.
    autoFlush: 1 # Fixes bloom intensity.
-    nativeScaling: 1 # Fixes post processing.
+    nativeScaling: 2 # Fixes post processing.
 SLES-54675:
  name: "Street Warrior"
  region: "PAL-E"
@@ -27265,6 +27278,8 @@ SLES-54997:
  gameFixes:
    - EETimingHack # Flickery textures.
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLES-54998:
  name: "Mercenaries 2 - L'enfer des Favelas"
@@ -27272,6 +27287,8 @@ SLES-54998:
  gameFixes:
    - EETimingHack # Flickery textures.
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLES-54999:
  name: "Mercenaries 2 - Inferno di Fuoco"
@@ -27279,6 +27296,8 @@ SLES-54999:
  gameFixes:
    - EETimingHack # Flickery textures.
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLES-55000:
  name: "Mercenaries 2 - World in Flames"
@@ -27286,6 +27305,8 @@ SLES-55000:
  gameFixes:
    - EETimingHack # Flickery textures.
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLES-55001:
  name: "Mercenaries 2 - World in Flames"
@@ -27293,6 +27314,8 @@ SLES-55001:
  gameFixes:
    - EETimingHack # Flickery textures.
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLES-55002:
  name: "Need for Speed - ProStreet"
@@ -29076,6 +29099,7 @@ SLES-82009:
  compat: 5
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -31535,6 +31559,7 @@ SLKA-35001:
  compat: 5
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -32158,6 +32183,8 @@ SLPM-55110:
  name-en: "Mercenaries 2 - World in Flames"
  region: "NTSC-J"
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLPM-55112:
  name: "三國志11 with パワーアップキット"
@@ -32738,6 +32765,8 @@ SLPM-55230:
  name-en: "Mercenaries 2 - World in Flames [EA:SY! 1980]"
  region: "NTSC-J"
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLPM-55231:
  name: "サイレントヒル シャッタードメモリーズ"
@@ -34961,6 +34990,7 @@ SLPM-62043:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -39269,6 +39299,7 @@ SLPM-65077:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -39283,6 +39314,7 @@ SLPM-65078:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -43099,6 +43131,7 @@ SLPM-65754:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -47733,6 +47766,7 @@ SLPM-66503:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -49498,6 +49532,7 @@ SLPM-66792:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -49509,6 +49544,7 @@ SLPM-66793:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -50639,6 +50675,7 @@ SLPM-67002:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -50683,6 +50720,7 @@ SLPM-67008:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -50824,6 +50862,7 @@ SLPM-67515:
  region: "NTSC-K"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -51057,6 +51096,7 @@ SLPM-68503:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -51606,6 +51646,7 @@ SLPM-74255:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -51617,6 +51658,7 @@ SLPM-74256:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -51919,6 +51961,7 @@ SLPM-74901:
  region: "NTSC-J"
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -59541,9 +59584,9 @@ SLPS-25856:
  region: "NTSC-J"
  gsHWFixes:
    textureInsideRT: 1 # Needed for post processing effects.
-    halfPixelOffset: 4 # Fixes offset post processing.
+    halfPixelOffset: 2 # Fixes offset post processing.
    autoFlush: 1 # Fixes bloom intensity.
-    nativeScaling: 1 # Fixes post processing.
+    nativeScaling: 2 # Fixes post processing.
 SLPS-25858:
  name: "灼眼のシャナ [電撃SP]"
  name-sort: "しゃくがんのしゃな [でんげきSP]"
@@ -60048,9 +60091,9 @@ SLPS-25946:
  region: "NTSC-J"
  gsHWFixes:
    textureInsideRT: 1 # Needed for post processing effects.
-    halfPixelOffset: 4 # Fixes offset post processing.
+    halfPixelOffset: 2 # Fixes offset post processing.
    autoFlush: 1 # Fixes bloom intensity.
-    nativeScaling: 1 # Fixes post processing.
+    nativeScaling: 2 # Fixes post processing.
 SLPS-25947:
  name: "サモンナイトグランテーゼ 滅びの剣と約束の騎士"
  name-sort: "さもんないとぐらんてーぜ ほろびのけんとやくそくのきし"
@@ -61729,6 +61772,7 @@ SLUS-20144:
  compat: 5
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -63758,6 +63802,7 @@ SLUS-20554:
  compat: 5
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
@@ -66800,9 +66845,13 @@ SLUS-21095:
  region: "NTSC-U"
  compat: 5
  gsHWFixes:
+    halfPixelOffset: 2 # Fixes post processing position.
+    nativeScaling: 2 # Fixes post effects.
    estimateTextureRegion: 1 # Improves performance and reduces hash cache size.
    gpuPaletteConversion: 2 # Improves performance and reduces hash cache size.
    autoFlush: 1 # Corrects shadows (Currently still broken even with this).
+    gpuTargetCLUT: 2 # Fixes light flicker.
+    getSkipCount: "GSC_DTGames"
 SLUS-21096:
  name: "Ape Escape - Pumped & Primed"
  region: "NTSC-U"
@@ -69596,9 +69645,9 @@ SLUS-21555:
  compat: 5
  gsHWFixes:
    textureInsideRT: 1 # Needed for post processing effects.
-    halfPixelOffset: 4 # Fixes offset post processing.
+    halfPixelOffset: 2 # Fixes offset post processing.
    autoFlush: 1 # Fixes bloom intensity.
-    nativeScaling: 1 # Fixes post processing.
+    nativeScaling: 2 # Fixes post processing.
 SLUS-21556:
  name: "Konami Kids Playground - Dinosaur Shapes & Colors"
  region: "NTSC-U"
@@ -70171,6 +70220,8 @@ SLUS-21650:
  gameFixes:
    - EETimingHack # Flickery textures.
  gsHWFixes:
+    minimumBlendingLevel: 2 # General lighting improvement over basic blend.
+    recommendedBlendingLevel: 4 # Further improves lighting on things like plants.
    nativeScaling: 1 # Fixes post lighting.
 SLUS-21651:
  name: "Noddy and the Magic Book"
@@ -70924,10 +70975,12 @@ SLUS-21793:
  compat: 3
  gsHWFixes:
    halfPixelOffset: 2 # Fixes post processing position.
-    nativeScaling: 1 # Fixes post effects.
+    nativeScaling: 2 # Fixes post effects.
    estimateTextureRegion: 1 # Improves performance and reduces hash cache size.
    gpuPaletteConversion: 2 # Improves performance and reduces hash cache size.
    autoFlush: 1 # Corrects shadows (Currently still broken even with this).
+    gpuTargetCLUT: 2 # Fixes light flicker.
+    getSkipCount: "GSC_DTGames"
 SLUS-21794:
  name: "Go, Diego, Go! Great Dinosaur Rescue"
  region: "NTSC-U"
@@ -71919,6 +71972,7 @@ SLUS-29003:
  compat: 5
  gameFixes:
    - InstantDMAHack # Fixes broken half-bottom artifacts.
+    - BlitInternalFPSHack # Fixes internal FPS detection.
  gsHWFixes:
    recommendedBlendingLevel: 3 # Fixes broken skin colour on Vlad and others.
    autoFlush: 1 # Fixes motion blur effect.
--- a/bin/resources/game_controller_db.txt
+++ b/bin/resources/game_controller_db.txt
@@ -446,7 +446,6 @@
 03000000250900006688000000000000,MP-8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000091200004488000000000000,MUSIA PlayStation 2 Input Display,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:b11,rightx:a2,righty:a3,start:b5,x:b1,y:b3,platform:Windows,
 03000000f70600000100000000000000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Windows,
-030000006f0e00001311000000000000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Windows,
 030000006b140000010c000000000000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000006b1400001106000000000000,Nacon Revolution 3 PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 0300000085320000170d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
@@ -637,6 +636,7 @@
 030000000d0f0000ad00000000000000,RX Gamepad,a:b0,b:b4,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b6,start:b9,x:b2,y:b1,platform:Windows,
 030000008916000000fe000000000000,Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000c6240000045d000000000000,Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001311000000000000,Saffun Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b0,platform:Windows,
 03000000a30600001af5000000000000,Saitek Cyborg,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
 03000000a306000023f6000000000000,Saitek Cyborg,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
 03000000300f00001201000000000000,Saitek Dual Analog,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
@@ -1441,7 +1441,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000250900006688000000010000,MP8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
 030000005e0400008e02000010020000,MSI GC20 V2,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000f70600000100000000010000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Linux,
-030000006f0e00001311000011010000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Linux,
 030000006b1400000906000014010000,Nacon Asymmetric Wireless PS4 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006b140000010c000010010000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 03000000853200000706000012010000,Nacon GC-100,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1497,11 +1496,11 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000006f0e00000901000011010000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 030000006f0e00002f01000011010000,PDP Wired PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000ad1b000004f9000000010000,PDP Xbox 360 Versus Fighting,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000f102000000000000,PDP Xbox Atomic,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e0000a802000023020000,PDP Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 030000006f0e0000a702000023020000,PDP Xbox One Raven Black,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e0000d802000006640000,PDP Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e0000ef02000007640000,PDP Xbox Series Kinetic Wired Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006f0e0000f102000000000000,PDP Xbox Atomic,a:b0,b:b1,x:b2,y:b3,back:b6,guide:b8,start:b7,leftshoulder:b4,rightshoulder:b5,leftstick:b9,rightstick:b10,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
 03000000c62400000053000000010000,PowerA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000c62400003a54000001010000,PowerA 1428124-01,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000d62000000540000001010000,PowerA Advantage Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1611,6 +1610,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000006f0e00001e01000011010000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000c6240000fefa000000010000,Rock Candy Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00004601000001010000,Rock Candy Xbox One Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00001311000011010000,Saffun Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b0,platform:Linux,
 03000000a306000023f6000011010000,Saitek Cyborg PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
 03000000a30600001005000000010000,Saitek P150,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b2,righttrigger:b5,x:b3,y:b4,platform:Linux,
 03000000a30600000701000000010000,Saitek P220,a:b2,b:b3,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,x:b0,y:b1,platform:Linux,
--- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp
+++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp
@@ -154,6 +154,60 @@ bool GSHwHack::GSC_SFEX3(GSRendererHW& r, int& skip)
 	return true;
 }

+bool GSHwHack::GSC_DTGames(GSRendererHW& r, int& skip)
+{
+	if (skip == 0)
+	{
+		// The game does a shuffle based on the result of a copy from the depth buffer, which ends up looking bizzare so PCSX2 doesn't know how to deal with it.
+		// What they're actually doing is copying the red/green channel of the result (kind of a shadow stencil) to the alpha channel.
+		// The further problem to this is the limitation of alpha we can save on an RT as they copy in 255, so I can cheese it here pretending it's RTA'd
+		if (RTME && RFPSM == PSMCT32 && RTBP0 == RFBP && RTPSM == PSMCT16 && RTEST.ATE && RTEST.ATST == ATST_NEVER && RTEST.AFAIL == AFAIL_FB_ONLY && RFBMSK == 0xFFFFFF)
+		{
+			GSTextureCache::Target* rt = g_texture_cache->LookupTarget(GIFRegTEX0::Create(RTBP0, RFBW, RFPSM),
+				GSVector2i(1, 1), r.GetTextureScaleFactor(), GSTextureCache::RenderTarget);
+
+			if (!rt)
+				return false;
+
+			// Clear down the alpha first.
+			GSHWDrawConfig& clear = r.BeginHLEHardwareDraw(
+				rt->GetTexture(), nullptr, rt->GetScale(), nullptr, rt->GetScale(), rt->GetUnscaledRect());
+			clear.colormask.wrgba = 0;
+			clear.colormask.wa = 1;
+			r.EndHLEHardwareDraw(false);
+
+			// Shuffle the green channel in to alpha.
+			GSHWDrawConfig& config = r.BeginHLEHardwareDraw(
+				rt->GetTexture(), nullptr, rt->GetScale(), rt->GetTexture(), rt->GetScale(), rt->GetUnscaledRect());
+			config.ps.shuffle = 1;
+			config.ps.dst_fmt = GSLocalMemory::PSM_FMT_32;
+			config.ps.write_rg = 0;
+			config.ps.shuffle_same = 0;
+			config.ps.real16src = 0;
+			config.ps.shuffle_across = 1;
+			config.ps.process_rg = r.SHUFFLE_READ;
+			config.ps.process_ba = r.SHUFFLE_WRITE;
+			config.colormask.wrgba = 0;
+			config.colormask.wa = 1;
+			config.ps.rta_correction = 1;
+			config.ps.tfx = TFX_DECAL;
+			config.ps.tcc = true;
+			r.EndHLEHardwareDraw(true);
+
+			rt->m_alpha_min = 0;
+			rt->m_alpha_max = 255;
+			skip = 69;
+		}
+	}
+	else
+	{
+		if (RTPSM != PSMCT16)
+			skip = 0;
+	}
+
+	return true;
+}
+
 bool GSHwHack::GSC_Tekken5(GSRendererHW& r, int& skip)
 {
 	if (skip == 0)
@@ -1471,6 +1525,7 @@ const GSHwHack::Entry<GSRendererHW::GSC_Ptr> GSHwHack::s_get_skip_count_function
 	CRC_F(GSC_SakuraWarsSoLongMyLove),
 	CRC_F(GSC_Simple2000Vol114),
 	CRC_F(GSC_SFEX3),
+	CRC_F(GSC_DTGames),
 	CRC_F(GSC_TalesOfLegendia),
 	CRC_F(GSC_TalesofSymphonia),
 	CRC_F(GSC_UrbanReign),
--- a/pcsx2/GS/Renderers/HW/GSHwHack.h
+++ b/pcsx2/GS/Renderers/HW/GSHwHack.h
@@ -11,6 +11,7 @@ public:
 	static bool GSC_Manhunt2(GSRendererHW& r, int& skip);
 	static bool GSC_SacredBlaze(GSRendererHW& r, int& skip);
 	static bool GSC_SFEX3(GSRendererHW& r, int& skip);
+	static bool GSC_DTGames(GSRendererHW& r, int& skip);
 	static bool GSC_Tekken5(GSRendererHW& r, int& skip);
 	static bool GSC_BurnoutGames(GSRendererHW& r, int& skip);
 	static bool GSC_BlackAndBurnoutSky(GSRendererHW& r, int& skip);
--- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
@@ -554,7 +554,7 @@ void GSRendererHW::ConvertSpriteTextureShuffle(u32& process_rg, u32& process_ba,
 		}
 		else
 		{
-			if ((floor(m_vt.m_max.p.y) <= rt->m_valid.w) && ((floor(m_vt.m_max.p.x) > (m_cached_ctx.FRAME.FBW * 64)) || (rt->m_TEX0.TBW != m_cached_ctx.FRAME.FBW)))
+			if (((m_r.width() + 8) & ~(GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].pgs.x - 1)) != GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].pgs.x && (floor(m_vt.m_max.p.y) <= rt->m_valid.w) && ((floor(m_vt.m_max.p.x) > (m_cached_ctx.FRAME.FBW * 64)) || (rt->m_TEX0.TBW < m_cached_ctx.FRAME.FBW)))
 			{
 				half_bottom_vert = false;
 				half_bottom_uv = false;
--- a/pcsx2/x86/ix86-32/iR5900.cpp
+++ b/pcsx2/x86/ix86-32/iR5900.cpp
@@ -594,6 +594,9 @@ static void recResetRaw()

 	g_branch = 0;
 	g_resetEeScalingStats = true;
+
+	memset(manual_page, 0, sizeof(manual_page));
+	memset(manual_counter, 0, sizeof(manual_counter));
 }

 void recShutdown()
Author	SHA1	Message	Date
TheLastRar	8316228771	iR5900: Reset manual protection counters	2025-02-12 12:12:05 -05:00
JordanTheToaster	695250155e	GameDB: Even more fixes	2025-02-12 12:09:05 -05:00
PCSX2 Bot	545e606c11	[ci skip] PAD: Update to latest controller database.	2025-02-10 17:26:03 +01:00
$refractionpcsx2$ refractionpcsx2	52771fdb17	GS/HW: Add CRC fixes for DT Carnage/Racer/Axel Impact	2025-02-10 15:06:29 +00:00