From 14b0b872c8ab52039943ad1d76d6ec744c33fda3 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Thu, 27 Nov 2025 18:27:38 -0600
Subject: [PATCH] GameSettings: Disable ImmediateXFB for many games where
 significantly problematic.

---
 Data/Sys/GameSettings/GDJ.ini                 | 5 +++++
 Data/Sys/GameSettings/GE9.ini                 | 5 ++++-
 Data/Sys/GameSettings/GMK.ini                 | 5 +++++
 Data/Sys/GameSettings/GRN.ini                 | 5 +++++
 Data/Sys/GameSettings/GUZ.ini                 | 2 +-
 Data/Sys/GameSettings/R2P.ini                 | 6 +++++-
 Data/Sys/GameSettings/R3P.ini                 | 5 +++++
 Data/Sys/GameSettings/R3X.ini                 | 5 +++++
 Data/Sys/GameSettings/R79.ini                 | 4 ++++
 Data/Sys/GameSettings/RC2.ini                 | 5 +++++
 Data/Sys/GameSettings/RCA.ini                 | 5 +++++
 Data/Sys/GameSettings/RGM.ini                 | 6 +++++-
 Data/Sys/GameSettings/RLS.ini                 | 3 ++-
 Data/Sys/GameSettings/RM4.ini                 | 5 +++++
 Data/Sys/GameSettings/RM6.ini                 | 5 +++++
 Data/Sys/GameSettings/ROQ.ini                 | 5 +++++
 Data/Sys/GameSettings/RPY.ini                 | 6 +++++-
 Data/Sys/GameSettings/RQN.ini                 | 5 +++++
 Data/Sys/GameSettings/RTC.ini                 | 5 +++++
 Data/Sys/GameSettings/SAK.ini                 | 2 ++
 Data/Sys/GameSettings/SCY.ini                 | 4 ++++
 Data/Sys/GameSettings/{SDAE5G.ini => SDA.ini} | 4 ++++
 Data/Sys/GameSettings/SEM.ini                 | 3 ++-
 Data/Sys/GameSettings/SJ2.ini                 | 5 +++++
 Data/Sys/GameSettings/SQI.ini                 | 4 ++++
 Data/Sys/GameSettings/STS.ini                 | 4 ++++
 Data/Sys/GameSettings/SX3.ini                 | 5 ++++-
 Data/Sys/GameSettings/WHY.ini                 | 5 +++++
 Data/Sys/GameSettings/WPK.ini                 | 5 +++++
 29 files changed, 125 insertions(+), 8 deletions(-)
 create mode 100644 Data/Sys/GameSettings/GDJ.ini
 create mode 100644 Data/Sys/GameSettings/GMK.ini
 create mode 100644 Data/Sys/GameSettings/GRN.ini
 create mode 100644 Data/Sys/GameSettings/R3P.ini
 create mode 100644 Data/Sys/GameSettings/R3X.ini
 create mode 100644 Data/Sys/GameSettings/RC2.ini
 create mode 100644 Data/Sys/GameSettings/RCA.ini
 create mode 100644 Data/Sys/GameSettings/RM4.ini
 create mode 100644 Data/Sys/GameSettings/RM6.ini
 create mode 100644 Data/Sys/GameSettings/ROQ.ini
 create mode 100644 Data/Sys/GameSettings/RQN.ini
 create mode 100644 Data/Sys/GameSettings/RTC.ini
 rename Data/Sys/GameSettings/{SDAE5G.ini => SDA.ini} (93%)
 create mode 100644 Data/Sys/GameSettings/SJ2.ini
 create mode 100644 Data/Sys/GameSettings/WHY.ini
 create mode 100644 Data/Sys/GameSettings/WPK.ini

diff --git a/Data/Sys/GameSettings/GDJ.ini b/Data/Sys/GameSettings/GDJ.ini
new file mode 100644
index 00000000000..6b27ce67fbb
--- /dev/null
+++ b/Data/Sys/GameSettings/GDJ.ini
@@ -0,0 +1,5 @@
+# GDJEB2, GDJJB2 - Digimon World 4
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GE9.ini b/Data/Sys/GameSettings/GE9.ini
index 781f2bb04b2..ea8c314514d 100644
--- a/Data/Sys/GameSettings/GE9.ini
+++ b/Data/Sys/GameSettings/GE9.ini
@@ -1,4 +1,4 @@
-# GE9E5D - Ed, Edd n Eddy
+# GE9E5D - Ed, Edd n Eddy: The Mis-Edventures
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -16,3 +16,6 @@ HLE_BS2 = True
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
+[Video_Hacks]
+# Avoids shifted screen.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GMK.ini b/Data/Sys/GameSettings/GMK.ini
new file mode 100644
index 00000000000..a8c8b92b0f2
--- /dev/null
+++ b/Data/Sys/GameSettings/GMK.ini
@@ -0,0 +1,5 @@
+# GMKE5D, GMKP5D, GMKD5D - Mortal Kombat: Deadly Alliance
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GRN.ini b/Data/Sys/GameSettings/GRN.ini
new file mode 100644
index 00000000000..9a8af763dc1
--- /dev/null
+++ b/Data/Sys/GameSettings/GRN.ini
@@ -0,0 +1,5 @@
+# GRNP52, GRNE52, GRNJCQ - Lost Kingdoms
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GUZ.ini b/Data/Sys/GameSettings/GUZ.ini
index 67db3ba3320..12d92f61b0b 100644
--- a/Data/Sys/GameSettings/GUZ.ini
+++ b/Data/Sys/GameSettings/GUZ.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/R2P.ini b/Data/Sys/GameSettings/R2P.ini
index e7aef5c46f8..ee9668f623a 100644
--- a/Data/Sys/GameSettings/R2P.ini
+++ b/Data/Sys/GameSettings/R2P.ini
@@ -1,4 +1,8 @@
-# R2PE9B, R2PJ9B, R2PKZ4, R2PP99 - Super Swing Golf Season 2
+# R2PP9B, R2PP99, R2PJ9B, R2PKZ4, R2PE9B - Super Swing Golf Season 2
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/R3P.ini b/Data/Sys/GameSettings/R3P.ini
new file mode 100644
index 00000000000..54a61bc97e8
--- /dev/null
+++ b/Data/Sys/GameSettings/R3P.ini
@@ -0,0 +1,5 @@
+# R3PEWR, R3PJ52, R3PPWR - Speed Racer
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/R3X.ini b/Data/Sys/GameSettings/R3X.ini
new file mode 100644
index 00000000000..af7eb19394a
--- /dev/null
+++ b/Data/Sys/GameSettings/R3X.ini
@@ -0,0 +1,5 @@
+# R3XE6U, R3XP6V - Sam & Max: Season One
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/R79.ini b/Data/Sys/GameSettings/R79.ini
index 9c07d610c2b..72eae594a8a 100644
--- a/Data/Sys/GameSettings/R79.ini
+++ b/Data/Sys/GameSettings/R79.ini
@@ -2,3 +2,7 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids black flickering while in game.
+ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/RC2.ini b/Data/Sys/GameSettings/RC2.ini
new file mode 100644
index 00000000000..4112894effe
--- /dev/null
+++ b/Data/Sys/GameSettings/RC2.ini
@@ -0,0 +1,5 @@
+# RC2E78, RC2P78, RC2X78, RC2Y78 - Cars Mater-National Championship
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RCA.ini b/Data/Sys/GameSettings/RCA.ini
new file mode 100644
index 00000000000..45b12d27310
--- /dev/null
+++ b/Data/Sys/GameSettings/RCA.ini
@@ -0,0 +1,5 @@
+# RCAJ78, RCAE78, RCAP78, RCAX78, RCAY78 - Cars (Wii)
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RGM.ini b/Data/Sys/GameSettings/RGM.ini
index 9b3e5659560..c75fe442654 100644
--- a/Data/Sys/GameSettings/RGM.ini
+++ b/Data/Sys/GameSettings/RGM.ini
@@ -1,4 +1,4 @@
-# RGME5D, RGMP5D - The Grim Adventures of Billy & Mandy
+# RGME5D, RGMP5D - The Grim Adventures of Billy & Mandy (Wii)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -11,3 +11,7 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RLS.ini b/Data/Sys/GameSettings/RLS.ini
index a89ed5c7b94..a443a71acac 100644
--- a/Data/Sys/GameSettings/RLS.ini
+++ b/Data/Sys/GameSettings/RLS.ini
@@ -1,4 +1,4 @@
-# RLSE8P - Alien Syndrome
+# RLSE8P, RLSP8P - Alien Syndrome
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -17,4 +17,5 @@ EFBToTextureEnable = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM4.ini b/Data/Sys/GameSettings/RM4.ini
new file mode 100644
index 00000000000..35bd77adc0b
--- /dev/null
+++ b/Data/Sys/GameSettings/RM4.ini
@@ -0,0 +1,5 @@
+# RM4J41, RM4E41, RM4P41 - Monster 4x4: World Circuit
+
+[Video_Hacks]
+# Avoids shifted screen and terrible frame pacing.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM6.ini b/Data/Sys/GameSettings/RM6.ini
new file mode 100644
index 00000000000..f60a40b539b
--- /dev/null
+++ b/Data/Sys/GameSettings/RM6.ini
@@ -0,0 +1,5 @@
+# RM6EEB, RM6P99 - Baroque
+
+[Video_Hacks]
+# Avoids constant flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/ROQ.ini b/Data/Sys/GameSettings/ROQ.ini
new file mode 100644
index 00000000000..bbafbc32ac9
--- /dev/null
+++ b/Data/Sys/GameSettings/ROQ.ini
@@ -0,0 +1,5 @@
+# ROQJEP - Baroque
+
+[Video_Hacks]
+# Avoids constant flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RPY.ini b/Data/Sys/GameSettings/RPY.ini
index 727dbb8e433..1cd647ef5d1 100644
--- a/Data/Sys/GameSettings/RPY.ini
+++ b/Data/Sys/GameSettings/RPY.ini
@@ -1,4 +1,4 @@
-# RPYP9B - Pangya! Golf with Style
+# RPYE9B, RPYJ9B, RPYP9B - Super Swing Golf
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,3 +12,7 @@ FPRF = True
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/RQN.ini b/Data/Sys/GameSettings/RQN.ini
new file mode 100644
index 00000000000..4d25d2a9778
--- /dev/null
+++ b/Data/Sys/GameSettings/RQN.ini
@@ -0,0 +1,5 @@
+# RQNEWR, RQNPWR - Scooby-Doo! First Frights
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RTC.ini b/Data/Sys/GameSettings/RTC.ini
new file mode 100644
index 00000000000..d38b29d16a7
--- /dev/null
+++ b/Data/Sys/GameSettings/RTC.ini
@@ -0,0 +1,5 @@
+# RTCE41, RTCP41 - Tom Clancy's Splinter Cell Double Agent (Wii)
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SAK.ini b/Data/Sys/GameSettings/SAK.ini
index 6ee72bff3fd..7c2edf9adec 100644
--- a/Data/Sys/GameSettings/SAK.ini
+++ b/Data/Sys/GameSettings/SAK.ini
@@ -11,6 +11,8 @@
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids constant black flickering.
+ImmediateXFBenable = False
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SCY.ini b/Data/Sys/GameSettings/SCY.ini
index 70f952ae463..f2311e3fb4f 100644
--- a/Data/Sys/GameSettings/SCY.ini
+++ b/Data/Sys/GameSettings/SCY.ini
@@ -12,3 +12,7 @@ LowDCBZHack = True
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 2048
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SDAE5G.ini b/Data/Sys/GameSettings/SDA.ini
similarity index 93%
rename from Data/Sys/GameSettings/SDAE5G.ini
rename to Data/Sys/GameSettings/SDA.ini
index a6f6abc8c8b..21f1666d928 100644
--- a/Data/Sys/GameSettings/SDAE5G.ini
+++ b/Data/Sys/GameSettings/SDA.ini
@@ -33,3 +33,7 @@ $Fix startup crash
 0x801C9E5C:dword:0x48032C75
 [OnFrame_Enabled]
 $Fix startup crash
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SEM.ini b/Data/Sys/GameSettings/SEM.ini
index 391fc38641b..1b923e03601 100644
--- a/Data/Sys/GameSettings/SEM.ini
+++ b/Data/Sys/GameSettings/SEM.ini
@@ -16,4 +16,5 @@ SafeTextureCacheColorSamples = 0
 ForceTextureFiltering = 0
 
 [Video_Hacks]
-
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SJ2.ini b/Data/Sys/GameSettings/SJ2.ini
new file mode 100644
index 00000000000..261f1504010
--- /dev/null
+++ b/Data/Sys/GameSettings/SJ2.ini
@@ -0,0 +1,5 @@
+# SJ2EWR, SJ2PWR - Scooby-Doo! And the Spooky Swamp
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SQI.ini b/Data/Sys/GameSettings/SQI.ini
index 99a662264cc..0b65c7e8ee3 100644
--- a/Data/Sys/GameSettings/SQI.ini
+++ b/Data/Sys/GameSettings/SQI.ini
@@ -12,3 +12,7 @@ LowDCBZHack = True
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 2048
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/STS.ini b/Data/Sys/GameSettings/STS.ini
index 1823d1d2118..0139cf71ff5 100644
--- a/Data/Sys/GameSettings/STS.ini
+++ b/Data/Sys/GameSettings/STS.ini
@@ -13,3 +13,7 @@
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SX3.ini b/Data/Sys/GameSettings/SX3.ini
index 462bd3ae782..78fd2c81117 100644
--- a/Data/Sys/GameSettings/SX3.ini
+++ b/Data/Sys/GameSettings/SX3.ini
@@ -1,4 +1,4 @@
-# SX3J01, SX3P01 - Pandora s Tower
+# SX3J01, SX3P01 - Pandora's Tower
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,3 +12,6 @@
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 
+[Video_Hacks]
+# Avoids shifted screen.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WHY.ini b/Data/Sys/GameSettings/WHY.ini
new file mode 100644
index 00000000000..497f9f53c10
--- /dev/null
+++ b/Data/Sys/GameSettings/WHY.ini
@@ -0,0 +1,5 @@
+# WHYETY - Heavy Fire: Black Arms
+
+[Video_Hacks]
+# Game is uncapped and slow to emulate.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WPK.ini b/Data/Sys/GameSettings/WPK.ini
new file mode 100644
index 00000000000..85cb70d363c
--- /dev/null
+++ b/Data/Sys/GameSettings/WPK.ini
@@ -0,0 +1,5 @@
+# WPKEGL, WPKPGL - Texas Hold'em Poker
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False