From 9396f0f58ea882445036f35b09b56fceb0363b30 Mon Sep 17 00:00:00 2001
From: Tillmann Karras <tilkax@gmail.com>
Date: Sat, 30 Aug 2025 02:34:19 +0100
Subject: [PATCH] GameSettings: clean up texture filtering settings

`MaxAnisotropy = 0` is no longer the safest setting because it forces 1x
even if the game asks for more.

`ForceFiltering` was replaced by `ForceTextureFiltering` in
afe9d5b098ffa32ab92a9795fac9553b29fc4bce. The one remaining occurrence
was merged later.

`ForceTextureFiltering` is an int option and shouldn't be set to False.

Just Dance 3, Just Dance: Best of, and Just Dance: Greatest Hits look
fine on AMD GPUs without manual texture sampling. On Nvidia GPUs they
have a single stripe that I think doesn't warrant forcing manual texture
sampling for everyone.

The NES games I tried worked fine with anisotropic filtering, it just
doesn't do anything.

Various games don't actually have any issue with anisotropic filtering
as long as it's not forced. The only game I could find that actually
requires the default aniso setting is Spider-Man: Shattered Dimensions.

Boogie SuperStar works fine with any texture filtering setting.
---
 Data/Sys/GameSettings/DD2.ini    |  8 ++++++--
 Data/Sys/GameSettings/E78.ini    |  2 +-
 Data/Sys/GameSettings/F.ini      |  3 +--
 Data/Sys/GameSettings/GMS.ini    |  2 +-
 Data/Sys/GameSettings/GOQ.ini    |  2 +-
 Data/Sys/GameSettings/GXG.ini    |  2 +-
 Data/Sys/GameSettings/GXU.ini    |  3 +--
 Data/Sys/GameSettings/GZW.ini    |  2 +-
 Data/Sys/GameSettings/HA8.ini    |  3 +--
 Data/Sys/GameSettings/HA9.ini    |  3 +--
 Data/Sys/GameSettings/HBA.ini    |  3 +--
 Data/Sys/GameSettings/HBB.ini    |  3 +--
 Data/Sys/GameSettings/HBC.ini    |  3 +--
 Data/Sys/GameSettings/HBD.ini    |  3 +--
 Data/Sys/GameSettings/PZL.ini    |  3 +--
 Data/Sys/GameSettings/R38.ini    |  2 +-
 Data/Sys/GameSettings/R3S.ini    |  2 +-
 Data/Sys/GameSettings/R5I.ini    |  2 +-
 Data/Sys/GameSettings/R6B.ini    |  2 +-
 Data/Sys/GameSettings/R9G.ini    |  2 +-
 Data/Sys/GameSettings/RBO.ini    |  3 +--
 Data/Sys/GameSettings/RCJ.ini    |  2 +-
 Data/Sys/GameSettings/RD2.ini    |  4 ++--
 Data/Sys/GameSettings/RG6.ini    |  6 ------
 Data/Sys/GameSettings/RGQ.ini    |  2 +-
 Data/Sys/GameSettings/RGW.ini    |  2 +-
 Data/Sys/GameSettings/RJ2.ini    |  3 +--
 Data/Sys/GameSettings/RM8.ini    |  2 +-
 Data/Sys/GameSettings/RN3.ini    |  2 +-
 Data/Sys/GameSettings/RO8.ini    |  2 +-
 Data/Sys/GameSettings/RQ6.ini    |  3 +--
 Data/Sys/GameSettings/RQL.ini    |  2 +-
 Data/Sys/GameSettings/RRB.ini    |  2 +-
 Data/Sys/GameSettings/RSN.ini    |  3 +--
 Data/Sys/GameSettings/RUS.ini    |  2 +-
 Data/Sys/GameSettings/RXI.ini    |  2 +-
 Data/Sys/GameSettings/RY2.ini    |  2 +-
 Data/Sys/GameSettings/S2C.ini    |  2 +-
 Data/Sys/GameSettings/S2E.ini    |  2 +-
 Data/Sys/GameSettings/S2W.ini    |  2 +-
 Data/Sys/GameSettings/S5D.ini    |  2 +-
 Data/Sys/GameSettings/SC7.ini    |  3 +--
 Data/Sys/GameSettings/SD2.ini    |  4 +++-
 Data/Sys/GameSettings/SD2J01.ini |  2 +-
 Data/Sys/GameSettings/SDB.ini    |  2 +-
 Data/Sys/GameSettings/SDN.ini    |  2 +-
 Data/Sys/GameSettings/SDZ.ini    |  2 +-
 Data/Sys/GameSettings/SE2.ini    |  2 +-
 Data/Sys/GameSettings/SEA.ini    |  2 +-
 Data/Sys/GameSettings/SEM.ini    |  2 +-
 Data/Sys/GameSettings/SEP.ini    |  2 +-
 Data/Sys/GameSettings/SER.ini    |  2 +-
 Data/Sys/GameSettings/SF2.ini    |  2 +-
 Data/Sys/GameSettings/SF8.ini    |  2 +-
 Data/Sys/GameSettings/SFU.ini    |  2 +-
 Data/Sys/GameSettings/SJ6.ini    |  2 +-
 Data/Sys/GameSettings/SJ7.ini    |  2 +-
 Data/Sys/GameSettings/SJ9.ini    |  2 +-
 Data/Sys/GameSettings/SJD.ini    |  5 +----
 Data/Sys/GameSettings/SJDJ01.ini |  2 +-
 Data/Sys/GameSettings/SJHE41.ini |  5 +----
 Data/Sys/GameSettings/SJTP41.ini |  5 +----
 Data/Sys/GameSettings/SJX.ini    | 14 --------------
 Data/Sys/GameSettings/SJZ.ini    |  2 +-
 Data/Sys/GameSettings/SMO.ini    |  2 +-
 Data/Sys/GameSettings/SOJ.ini    |  2 +-
 Data/Sys/GameSettings/SPD.ini    |  4 ++--
 Data/Sys/GameSettings/SR4.ini    |  2 +-
 Data/Sys/GameSettings/SR5.ini    |  2 +-
 Data/Sys/GameSettings/SUO.ini    |  2 +-
 Data/Sys/GameSettings/SZB.ini    |  3 +--
 Data/Sys/GameSettings/WR2.ini    |  2 +-
 72 files changed, 79 insertions(+), 117 deletions(-)
 delete mode 100644 Data/Sys/GameSettings/SJX.ini

diff --git a/Data/Sys/GameSettings/DD2.ini b/Data/Sys/GameSettings/DD2.ini
index 8b40b93198e..52607f8ae8c 100644
--- a/Data/Sys/GameSettings/DD2.ini
+++ b/Data/Sys/GameSettings/DD2.ini
@@ -13,5 +13,9 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+# Linear filtering completely messes up the videos.
+ForceTextureFiltering = 0
+
+[Video_Hacks]
+# Manual texture sampling partially fixes the video issues.
+FastTextureSampling = False
diff --git a/Data/Sys/GameSettings/E78.ini b/Data/Sys/GameSettings/E78.ini
index ac63ac72e32..a7457dcb3d0 100644
--- a/Data/Sys/GameSettings/E78.ini
+++ b/Data/Sys/GameSettings/E78.ini
@@ -18,5 +18,5 @@ EFBEmulateFormatChanges = True
 MSAA = 0
 
 [Video_Enhancements]
-ForceFiltering = False
+ForceTextureFiltering = 0
 ForceTrueColor = False
diff --git a/Data/Sys/GameSettings/F.ini b/Data/Sys/GameSettings/F.ini
index 92dda64b07e..4c47b750d1f 100644
--- a/Data/Sys/GameSettings/F.ini
+++ b/Data/Sys/GameSettings/F.ini
@@ -18,5 +18,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/GMS.ini b/Data/Sys/GameSettings/GMS.ini
index 46729366201..162644b033d 100644
--- a/Data/Sys/GameSettings/GMS.ini
+++ b/Data/Sys/GameSettings/GMS.ini
@@ -18,7 +18,7 @@ EFBAccessEnable = True
 MissingColorValue = 0x00000000
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 ArbitraryMipmapDetection = True
 
 [Video_Settings]
diff --git a/Data/Sys/GameSettings/GOQ.ini b/Data/Sys/GameSettings/GOQ.ini
index 5655db397d0..5d9856e33c0 100644
--- a/Data/Sys/GameSettings/GOQ.ini
+++ b/Data/Sys/GameSettings/GOQ.ini
@@ -10,4 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-MaxAnisotropy = 0
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/GXG.ini b/Data/Sys/GameSettings/GXG.ini
index 545fb894b3d..21e07bb8b9c 100644
--- a/Data/Sys/GameSettings/GXG.ini
+++ b/Data/Sys/GameSettings/GXG.ini
@@ -7,4 +7,4 @@
 SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 # Texture filtering causes lines with Mega Man X 3
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/GXU.ini b/Data/Sys/GameSettings/GXU.ini
index 9f68365a687..e4d4a16a986 100644
--- a/Data/Sys/GameSettings/GXU.ini
+++ b/Data/Sys/GameSettings/GXU.ini
@@ -11,5 +11,4 @@ MMU = True
 # Add action replay cheats here.
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/GZW.ini b/Data/Sys/GameSettings/GZW.ini
index 0833a6ca453..4fab7c66836 100644
--- a/Data/Sys/GameSettings/GZW.ini
+++ b/Data/Sys/GameSettings/GZW.ini
@@ -13,4 +13,4 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/HA8.ini b/Data/Sys/GameSettings/HA8.ini
index 3ef7f001434..6f7e0be7213 100644
--- a/Data/Sys/GameSettings/HA8.ini
+++ b/Data/Sys/GameSettings/HA8.ini
@@ -10,5 +10,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/HA9.ini b/Data/Sys/GameSettings/HA9.ini
index 11c9d9b16c5..9a2866dc09a 100644
--- a/Data/Sys/GameSettings/HA9.ini
+++ b/Data/Sys/GameSettings/HA9.ini
@@ -10,5 +10,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/HBA.ini b/Data/Sys/GameSettings/HBA.ini
index 32d45077eb5..b1c64487340 100644
--- a/Data/Sys/GameSettings/HBA.ini
+++ b/Data/Sys/GameSettings/HBA.ini
@@ -10,5 +10,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/HBB.ini b/Data/Sys/GameSettings/HBB.ini
index 7f20f94d0bd..00e1e355200 100644
--- a/Data/Sys/GameSettings/HBB.ini
+++ b/Data/Sys/GameSettings/HBB.ini
@@ -10,5 +10,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/HBC.ini b/Data/Sys/GameSettings/HBC.ini
index afd20305c5c..85f00e52023 100644
--- a/Data/Sys/GameSettings/HBC.ini
+++ b/Data/Sys/GameSettings/HBC.ini
@@ -10,5 +10,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/HBD.ini b/Data/Sys/GameSettings/HBD.ini
index 4112bb1f4ca..05048604e8f 100644
--- a/Data/Sys/GameSettings/HBD.ini
+++ b/Data/Sys/GameSettings/HBD.ini
@@ -10,5 +10,4 @@ SafeTextureCacheColorSamples = 0
 EFBToTextureEnable = False
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/PZL.ini b/Data/Sys/GameSettings/PZL.ini
index 3fe191ee0d8..3ce87e02243 100644
--- a/Data/Sys/GameSettings/PZL.ini
+++ b/Data/Sys/GameSettings/PZL.ini
@@ -19,5 +19,4 @@ ImmediateXFBEnable = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/R38.ini b/Data/Sys/GameSettings/R38.ini
index 9746a27d5d4..b88dd2a4498 100644
--- a/Data/Sys/GameSettings/R38.ini
+++ b/Data/Sys/GameSettings/R38.ini
@@ -11,7 +11,7 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 # Needed for some FMVs.
diff --git a/Data/Sys/GameSettings/R3S.ini b/Data/Sys/GameSettings/R3S.ini
index fc5df288233..8d0dd9c50a1 100644
--- a/Data/Sys/GameSettings/R3S.ini
+++ b/Data/Sys/GameSettings/R3S.ini
@@ -2,4 +2,4 @@
 
 [Video_Enhancements]
 # FMVs get messed up if this is on
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/R5I.ini b/Data/Sys/GameSettings/R5I.ini
index c6bb26e494d..35192af0e48 100644
--- a/Data/Sys/GameSettings/R5I.ini
+++ b/Data/Sys/GameSettings/R5I.ini
@@ -13,5 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
diff --git a/Data/Sys/GameSettings/R6B.ini b/Data/Sys/GameSettings/R6B.ini
index e182ec5fa29..275d7aa197a 100644
--- a/Data/Sys/GameSettings/R6B.ini
+++ b/Data/Sys/GameSettings/R6B.ini
@@ -11,7 +11,7 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 # Needed for some FMVs.
diff --git a/Data/Sys/GameSettings/R9G.ini b/Data/Sys/GameSettings/R9G.ini
index 6298a5a1974..3bb7cfe96e2 100644
--- a/Data/Sys/GameSettings/R9G.ini
+++ b/Data/Sys/GameSettings/R9G.ini
@@ -11,4 +11,4 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/RBO.ini b/Data/Sys/GameSettings/RBO.ini
index 81efec7568d..d01bbed817a 100644
--- a/Data/Sys/GameSettings/RBO.ini
+++ b/Data/Sys/GameSettings/RBO.ini
@@ -12,8 +12,7 @@
 [Video_Settings]
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RCJ.ini b/Data/Sys/GameSettings/RCJ.ini
index b43b8afdc50..523aa134365 100644
--- a/Data/Sys/GameSettings/RCJ.ini
+++ b/Data/Sys/GameSettings/RCJ.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 
diff --git a/Data/Sys/GameSettings/RD2.ini b/Data/Sys/GameSettings/RD2.ini
index d5e77dad5d7..af0b262c00e 100644
--- a/Data/Sys/GameSettings/RD2.ini
+++ b/Data/Sys/GameSettings/RD2.ini
@@ -10,5 +10,5 @@ CPUThread = False
 # Add action replay cheats here.
 
 [Video_Enhancements]
-# Anisotropic Filtering breaks FMVs
-MaxAnisotropy = 0
+# Linear filtering breaks FMVs
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/RG6.ini b/Data/Sys/GameSettings/RG6.ini
index 91e5522498c..06d850465a1 100644
--- a/Data/Sys/GameSettings/RG6.ini
+++ b/Data/Sys/GameSettings/RG6.ini
@@ -9,11 +9,5 @@
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video_Settings]
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
-
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RGQ.ini b/Data/Sys/GameSettings/RGQ.ini
index 80181c473fa..5997abcb90e 100644
--- a/Data/Sys/GameSettings/RGQ.ini
+++ b/Data/Sys/GameSettings/RGQ.ini
@@ -10,5 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
diff --git a/Data/Sys/GameSettings/RGW.ini b/Data/Sys/GameSettings/RGW.ini
index 428d6b071d1..0915a82ad99 100644
--- a/Data/Sys/GameSettings/RGW.ini
+++ b/Data/Sys/GameSettings/RGW.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/RJ2.ini b/Data/Sys/GameSettings/RJ2.ini
index de471ec070f..b4f4634f7c2 100644
--- a/Data/Sys/GameSettings/RJ2.ini
+++ b/Data/Sys/GameSettings/RJ2.ini
@@ -13,8 +13,7 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM8.ini b/Data/Sys/GameSettings/RM8.ini
index 5aabd097bd3..29c7ebdef55 100644
--- a/Data/Sys/GameSettings/RM8.ini
+++ b/Data/Sys/GameSettings/RM8.ini
@@ -4,6 +4,6 @@
 [OnFrame]
 [ActionReplay]
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 [Video_Hacks]
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RN3.ini b/Data/Sys/GameSettings/RN3.ini
index c5fb98dc720..78b2b7a30c6 100644
--- a/Data/Sys/GameSettings/RN3.ini
+++ b/Data/Sys/GameSettings/RN3.ini
@@ -11,7 +11,7 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 # Needed for some FMVs.
diff --git a/Data/Sys/GameSettings/RO8.ini b/Data/Sys/GameSettings/RO8.ini
index 5c70d6ce3c1..9af1a81ae99 100644
--- a/Data/Sys/GameSettings/RO8.ini
+++ b/Data/Sys/GameSettings/RO8.ini
@@ -11,4 +11,4 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/RQ6.ini b/Data/Sys/GameSettings/RQ6.ini
index 07f8b1cfec9..bff88a73f52 100644
--- a/Data/Sys/GameSettings/RQ6.ini
+++ b/Data/Sys/GameSettings/RQ6.ini
@@ -10,5 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/RQL.ini b/Data/Sys/GameSettings/RQL.ini
index c6ddf6da357..e5772fbd901 100644
--- a/Data/Sys/GameSettings/RQL.ini
+++ b/Data/Sys/GameSettings/RQL.ini
@@ -11,4 +11,4 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/RRB.ini b/Data/Sys/GameSettings/RRB.ini
index 7b382267734..2c1a40e009b 100644
--- a/Data/Sys/GameSettings/RRB.ini
+++ b/Data/Sys/GameSettings/RRB.ini
@@ -11,7 +11,7 @@ CPUThread = False
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/RSN.ini b/Data/Sys/GameSettings/RSN.ini
index 39eae59fd88..87e3a0d31b8 100644
--- a/Data/Sys/GameSettings/RSN.ini
+++ b/Data/Sys/GameSettings/RSN.ini
@@ -11,8 +11,7 @@ CPUThread = False
 # Add action replay cheats here.
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RUS.ini b/Data/Sys/GameSettings/RUS.ini
index 87be520d57c..4b061323988 100644
--- a/Data/Sys/GameSettings/RUS.ini
+++ b/Data/Sys/GameSettings/RUS.ini
@@ -11,7 +11,7 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 # Needed for some FMVs.
diff --git a/Data/Sys/GameSettings/RXI.ini b/Data/Sys/GameSettings/RXI.ini
index 05e1a634c56..e85bcc2cfd8 100644
--- a/Data/Sys/GameSettings/RXI.ini
+++ b/Data/Sys/GameSettings/RXI.ini
@@ -11,4 +11,4 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/RY2.ini b/Data/Sys/GameSettings/RY2.ini
index de77ffabb12..0a9bd4cd052 100644
--- a/Data/Sys/GameSettings/RY2.ini
+++ b/Data/Sys/GameSettings/RY2.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/S2C.ini b/Data/Sys/GameSettings/S2C.ini
index 2c0fdaec25e..54dd63ffa3f 100644
--- a/Data/Sys/GameSettings/S2C.ini
+++ b/Data/Sys/GameSettings/S2C.ini
@@ -10,4 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/S2E.ini b/Data/Sys/GameSettings/S2E.ini
index 227abeae713..0ab6d278607 100644
--- a/Data/Sys/GameSettings/S2E.ini
+++ b/Data/Sys/GameSettings/S2E.ini
@@ -10,4 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/S2W.ini b/Data/Sys/GameSettings/S2W.ini
index 7cf8b6caa7b..65a70183e42 100644
--- a/Data/Sys/GameSettings/S2W.ini
+++ b/Data/Sys/GameSettings/S2W.ini
@@ -14,4 +14,4 @@ SafeTextureCacheColorSamples = 512
 SuggestedAspectRatio = 2
 
 [Video_Enhancements]
-MaxAnisotropy = 0
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/S5D.ini b/Data/Sys/GameSettings/S5D.ini
index 3e9b0caeb7f..9e6bac7c846 100644
--- a/Data/Sys/GameSettings/S5D.ini
+++ b/Data/Sys/GameSettings/S5D.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SC7.ini b/Data/Sys/GameSettings/SC7.ini
index dd52db6941d..1c826774a9b 100644
--- a/Data/Sys/GameSettings/SC7.ini
+++ b/Data/Sys/GameSettings/SC7.ini
@@ -10,5 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SD2.ini b/Data/Sys/GameSettings/SD2.ini
index 5e4911d8fad..0f0b9151f66 100644
--- a/Data/Sys/GameSettings/SD2.ini
+++ b/Data/Sys/GameSettings/SD2.ini
@@ -10,7 +10,9 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+# Linear filtering completely messes up the videos.
+ForceTextureFiltering = 0
 
 [Video_Hacks]
+# Manual texture sampling partially fixes the video issues.
 FastTextureSampling = False
diff --git a/Data/Sys/GameSettings/SD2J01.ini b/Data/Sys/GameSettings/SD2J01.ini
index 87f7f48a433..f67ea2d977b 100644
--- a/Data/Sys/GameSettings/SD2J01.ini
+++ b/Data/Sys/GameSettings/SD2J01.ini
@@ -13,7 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 FastTextureSampling = False
diff --git a/Data/Sys/GameSettings/SDB.ini b/Data/Sys/GameSettings/SDB.ini
index 4524952b613..244f84fc203 100644
--- a/Data/Sys/GameSettings/SDB.ini
+++ b/Data/Sys/GameSettings/SDB.ini
@@ -11,7 +11,7 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 # Needed for some FMVs.
diff --git a/Data/Sys/GameSettings/SDN.ini b/Data/Sys/GameSettings/SDN.ini
index 0fcdc388306..419c37b4619 100644
--- a/Data/Sys/GameSettings/SDN.ini
+++ b/Data/Sys/GameSettings/SDN.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 FastTextureSampling = False
diff --git a/Data/Sys/GameSettings/SDZ.ini b/Data/Sys/GameSettings/SDZ.ini
index 0fc4726f42a..da30a08c84a 100644
--- a/Data/Sys/GameSettings/SDZ.ini
+++ b/Data/Sys/GameSettings/SDZ.ini
@@ -11,4 +11,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SE2.ini b/Data/Sys/GameSettings/SE2.ini
index a6cd50c0102..37f6253eada 100644
--- a/Data/Sys/GameSettings/SE2.ini
+++ b/Data/Sys/GameSettings/SE2.ini
@@ -13,7 +13,7 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 # Needed to correctly render clothing
diff --git a/Data/Sys/GameSettings/SEA.ini b/Data/Sys/GameSettings/SEA.ini
index 6e5aa295b64..f43061c7f01 100644
--- a/Data/Sys/GameSettings/SEA.ini
+++ b/Data/Sys/GameSettings/SEA.ini
@@ -13,5 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
diff --git a/Data/Sys/GameSettings/SEM.ini b/Data/Sys/GameSettings/SEM.ini
index 60fff339d6d..391fc38641b 100644
--- a/Data/Sys/GameSettings/SEM.ini
+++ b/Data/Sys/GameSettings/SEM.ini
@@ -13,7 +13,7 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 
diff --git a/Data/Sys/GameSettings/SEP.ini b/Data/Sys/GameSettings/SEP.ini
index b01a551a1e6..9d27ff0a716 100644
--- a/Data/Sys/GameSettings/SEP.ini
+++ b/Data/Sys/GameSettings/SEP.ini
@@ -10,4 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SER.ini b/Data/Sys/GameSettings/SER.ini
index fa57eae0e16..2e633e777ce 100644
--- a/Data/Sys/GameSettings/SER.ini
+++ b/Data/Sys/GameSettings/SER.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SF2.ini b/Data/Sys/GameSettings/SF2.ini
index b7a91bcae87..bfc9f854e2f 100644
--- a/Data/Sys/GameSettings/SF2.ini
+++ b/Data/Sys/GameSettings/SF2.ini
@@ -11,4 +11,4 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SF8.ini b/Data/Sys/GameSettings/SF8.ini
index 3c3fcedb3ea..cc3e16849a1 100644
--- a/Data/Sys/GameSettings/SF8.ini
+++ b/Data/Sys/GameSettings/SF8.ini
@@ -14,7 +14,7 @@ SafeTextureCacheColorSamples = 512
 
 [Video_Enhancements]
 # Enabling this causes Donkey Kong/Diddy Kong to have an outline.
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Stereoscopy]
 StereoConvergence = 26
diff --git a/Data/Sys/GameSettings/SFU.ini b/Data/Sys/GameSettings/SFU.ini
index bcce096b91f..32d6c9004d9 100644
--- a/Data/Sys/GameSettings/SFU.ini
+++ b/Data/Sys/GameSettings/SFU.ini
@@ -11,4 +11,4 @@
 
 [Video_Enhancements]
 # Fixes FMVs
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SJ6.ini b/Data/Sys/GameSettings/SJ6.ini
index fd0eeed4ad7..3084f991f19 100644
--- a/Data/Sys/GameSettings/SJ6.ini
+++ b/Data/Sys/GameSettings/SJ6.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SJ7.ini b/Data/Sys/GameSettings/SJ7.ini
index e91039b1ad9..da45562c101 100644
--- a/Data/Sys/GameSettings/SJ7.ini
+++ b/Data/Sys/GameSettings/SJ7.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SJ9.ini b/Data/Sys/GameSettings/SJ9.ini
index c643016e7a6..a668bf35e70 100644
--- a/Data/Sys/GameSettings/SJ9.ini
+++ b/Data/Sys/GameSettings/SJ9.ini
@@ -11,7 +11,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 FastTextureSampling = False
diff --git a/Data/Sys/GameSettings/SJD.ini b/Data/Sys/GameSettings/SJD.ini
index 6cefef7f3c0..3e20b7cef91 100644
--- a/Data/Sys/GameSettings/SJD.ini
+++ b/Data/Sys/GameSettings/SJD.ini
@@ -10,7 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
-
-[Video_Hacks]
-FastTextureSampling = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SJDJ01.ini b/Data/Sys/GameSettings/SJDJ01.ini
index 7a1807e5921..1befe2e5204 100644
--- a/Data/Sys/GameSettings/SJDJ01.ini
+++ b/Data/Sys/GameSettings/SJDJ01.ini
@@ -13,7 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 FastTextureSampling = False
diff --git a/Data/Sys/GameSettings/SJHE41.ini b/Data/Sys/GameSettings/SJHE41.ini
index 0f356a2e768..79bc7107371 100644
--- a/Data/Sys/GameSettings/SJHE41.ini
+++ b/Data/Sys/GameSettings/SJHE41.ini
@@ -10,7 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
-
-[Video_Hacks]
-FastTextureSampling = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SJTP41.ini b/Data/Sys/GameSettings/SJTP41.ini
index 5812c99e3b0..983587e95d5 100644
--- a/Data/Sys/GameSettings/SJTP41.ini
+++ b/Data/Sys/GameSettings/SJTP41.ini
@@ -10,7 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
-
-[Video_Hacks]
-FastTextureSampling = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SJX.ini b/Data/Sys/GameSettings/SJX.ini
deleted file mode 100644
index f3eb128cbbc..00000000000
--- a/Data/Sys/GameSettings/SJX.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# SJXD41, SJXE41, SJXP41 - Just Dance 4
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Enhancements]
-MaxAnisotropy = 0
-ForceTextureFiltering = False
diff --git a/Data/Sys/GameSettings/SJZ.ini b/Data/Sys/GameSettings/SJZ.ini
index 250cacbd1c0..2fce2e4160f 100644
--- a/Data/Sys/GameSettings/SJZ.ini
+++ b/Data/Sys/GameSettings/SJZ.ini
@@ -11,7 +11,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/SMO.ini b/Data/Sys/GameSettings/SMO.ini
index 672e24ef112..60e73f5b1ca 100644
--- a/Data/Sys/GameSettings/SMO.ini
+++ b/Data/Sys/GameSettings/SMO.ini
@@ -10,4 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SOJ.ini b/Data/Sys/GameSettings/SOJ.ini
index e17feacd3e5..4ad4d801ffc 100644
--- a/Data/Sys/GameSettings/SOJ.ini
+++ b/Data/Sys/GameSettings/SOJ.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SPD.ini b/Data/Sys/GameSettings/SPD.ini
index 720d351ffec..ce9f13ed848 100644
--- a/Data/Sys/GameSettings/SPD.ini
+++ b/Data/Sys/GameSettings/SPD.ini
@@ -10,8 +10,8 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-MaxAnisotropy = 0
+# Required to avoid very obvious graphical corruption.
+MaxAnisotropy = -1
 
 [Video_Hacks]
 EFBToTextureEnable = False
-
diff --git a/Data/Sys/GameSettings/SR4.ini b/Data/Sys/GameSettings/SR4.ini
index 818f4e5f441..0d54d75f59c 100644
--- a/Data/Sys/GameSettings/SR4.ini
+++ b/Data/Sys/GameSettings/SR4.ini
@@ -11,4 +11,4 @@ CPUThread = False
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SR5.ini b/Data/Sys/GameSettings/SR5.ini
index 61d67f85ed7..dfbc3e99ed4 100644
--- a/Data/Sys/GameSettings/SR5.ini
+++ b/Data/Sys/GameSettings/SR5.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SUO.ini b/Data/Sys/GameSettings/SUO.ini
index 1a5f2630d7e..fc26265b1ad 100644
--- a/Data/Sys/GameSettings/SUO.ini
+++ b/Data/Sys/GameSettings/SUO.ini
@@ -10,4 +10,4 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
diff --git a/Data/Sys/GameSettings/SZB.ini b/Data/Sys/GameSettings/SZB.ini
index f55351b6bde..12432f10b87 100644
--- a/Data/Sys/GameSettings/SZB.ini
+++ b/Data/Sys/GameSettings/SZB.ini
@@ -10,8 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
-MaxAnisotropy = 0
+ForceTextureFiltering = 0
 
 [Video_Hacks]
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/WR2.ini b/Data/Sys/GameSettings/WR2.ini
index a45e78eb056..3c4a3f1a0fd 100644
--- a/Data/Sys/GameSettings/WR2.ini
+++ b/Data/Sys/GameSettings/WR2.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Enhancements]
-ForceTextureFiltering = False
+ForceTextureFiltering = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0