From b3f611e14ad5476915d80c29e604ccc67f93f25e Mon Sep 17 00:00:00 2001
From: Linktothepast <kostamarino@gmail.com>
Date: Sat, 19 Apr 2014 12:16:13 +0300
Subject: [PATCH 1/2] Gameini updates.

Updates game inis for Serious Sam: Next Encounter (gc), CAPCOM VS. SNK 2
EO (gc), Baten Kaitos Origins (gc), Baten Kaitos Eternal Wings and the
Lost Ocean (gc), Sonic Adventure 2 Battle (gc), Sonic Riders (gc), Sonic
Adventure DX (gc), Mini Ninjas (wii), The Legend of Zelda Skyward Sword
(wii).
Fixes issues 7146 and 6440.
---
 Data/Sys/GameSettings/G3BE9G.ini | 30 +++++++++++++++++++++++++++
 Data/Sys/GameSettings/G3BP54.ini | 30 +++++++++++++++++++++++++++
 Data/Sys/GameSettings/G3BP9G.ini | 30 +++++++++++++++++++++++++++
 Data/Sys/GameSettings/GEOE08.ini |  6 ++----
 Data/Sys/GameSettings/GEOP08.ini |  6 ++----
 Data/Sys/GameSettings/GK4E01.ini |  4 ++++
 Data/Sys/GameSettings/GK4J01.ini | 35 ++++++++++++++++++++++++++++++++
 Data/Sys/GameSettings/GKBEAF.ini |  2 ++
 Data/Sys/GameSettings/GKBJAF.ini |  2 ++
 Data/Sys/GameSettings/GKBPAF.ini |  2 ++
 Data/Sys/GameSettings/GSBJ8P.ini | 19 +++++++++++++++++
 Data/Sys/GameSettings/GSNE8P.ini |  1 +
 Data/Sys/GameSettings/GSNP8P.ini |  1 +
 Data/Sys/GameSettings/GXEE8P.ini |  7 ++-----
 Data/Sys/GameSettings/GXEJ8P.ini | 19 +++++++++++++++++
 Data/Sys/GameSettings/GXEP8P.ini |  2 ++
 Data/Sys/GameSettings/GXSE8P.ini |  5 ++++-
 Data/Sys/GameSettings/GXSP6W.ini | 25 +++++++++++++++++++++++
 Data/Sys/GameSettings/GXSP8P.ini |  6 +++++-
 Data/Sys/GameSettings/RNJE4F.ini | 21 +++++++++++++++++++
 Data/Sys/GameSettings/RNJP4F.ini | 21 +++++++++++++++++++
 Data/Sys/GameSettings/SOUE01.ini |  1 +
 Data/Sys/GameSettings/SOUJ01.ini |  1 +
 Data/Sys/GameSettings/SOUK01.ini |  1 +
 Data/Sys/GameSettings/SOUP01.ini |  1 +
 25 files changed, 263 insertions(+), 15 deletions(-)
 create mode 100644 Data/Sys/GameSettings/G3BE9G.ini
 create mode 100644 Data/Sys/GameSettings/G3BP54.ini
 create mode 100644 Data/Sys/GameSettings/G3BP9G.ini
 create mode 100644 Data/Sys/GameSettings/GK4J01.ini
 create mode 100644 Data/Sys/GameSettings/GSBJ8P.ini
 create mode 100644 Data/Sys/GameSettings/GXEJ8P.ini
 create mode 100644 Data/Sys/GameSettings/GXSP6W.ini
 create mode 100644 Data/Sys/GameSettings/RNJE4F.ini
 create mode 100644 Data/Sys/GameSettings/RNJP4F.ini

diff --git a/Data/Sys/GameSettings/G3BE9G.ini b/Data/Sys/GameSettings/G3BE9G.ini
new file mode 100644
index 0000000000..c11e01c7d9
--- /dev/null
+++ b/Data/Sys/GameSettings/G3BE9G.ini
@@ -0,0 +1,30 @@
+# G3BE9G - Serious Sam: Next Encounter
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram for transition scenes.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G3BP54.ini b/Data/Sys/GameSettings/G3BP54.ini
new file mode 100644
index 0000000000..53a40028db
--- /dev/null
+++ b/Data/Sys/GameSettings/G3BP54.ini
@@ -0,0 +1,30 @@
+# G3BP54 - Serious Sam: Next Encounter
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram for transition scenes.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/G3BP9G.ini b/Data/Sys/GameSettings/G3BP9G.ini
new file mode 100644
index 0000000000..9fd3e79f33
--- /dev/null
+++ b/Data/Sys/GameSettings/G3BP9G.ini
@@ -0,0 +1,30 @@
+# G3BP9G - Serious Sam: Next Encounter
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs EFB to Ram for transition scenes.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/Sys/GameSettings/GEOE08.ini b/Data/Sys/GameSettings/GEOE08.ini
index a34035caf9..1cc77cd5df 100644
--- a/Data/Sys/GameSettings/GEOE08.ini
+++ b/Data/Sys/GameSettings/GEOE08.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = GFX glitches
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -28,7 +28,5 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-
 SafeTextureCacheColorSamples = 512
-EFBScale = 0
-
+EFBScale = -1
diff --git a/Data/Sys/GameSettings/GEOP08.ini b/Data/Sys/GameSettings/GEOP08.ini
index 00a1a50089..566d1a9799 100644
--- a/Data/Sys/GameSettings/GEOP08.ini
+++ b/Data/Sys/GameSettings/GEOP08.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = GFX glitches
+EmulationIssues = 
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -28,7 +28,5 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-
 SafeTextureCacheColorSamples = 512
-EFBScale = 0
-
+EFBScale = -1
diff --git a/Data/Sys/GameSettings/GK4E01.ini b/Data/Sys/GameSettings/GK4E01.ini
index f9b290a937..1fa81dce8c 100644
--- a/Data/Sys/GameSettings/GK4E01.ini
+++ b/Data/Sys/GameSettings/GK4E01.ini
@@ -68,3 +68,7 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GK4J01.ini b/Data/Sys/GameSettings/GK4J01.ini
new file mode 100644
index 0000000000..9709a07ef9
--- /dev/null
+++ b/Data/Sys/GameSettings/GK4J01.ini
@@ -0,0 +1,35 @@
+# GK4J01 - Baten Kaitos II: Hajimari no Tsubasa to Kamigami no Shishi
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear =
+PH_ZFar =
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+
diff --git a/Data/Sys/GameSettings/GKBEAF.ini b/Data/Sys/GameSettings/GKBEAF.ini
index 6e84a49d34..548ec6a5e2 100644
--- a/Data/Sys/GameSettings/GKBEAF.ini
+++ b/Data/Sys/GameSettings/GKBEAF.ini
@@ -28,6 +28,8 @@ PH_ZFar =
 
 [Video_Hacks]
 EFBAccessEnable = False
+EFBCopyEnable = True
+EFBToTextureEnable = False
 
 [Video_Settings]
 UseXFB = True
diff --git a/Data/Sys/GameSettings/GKBJAF.ini b/Data/Sys/GameSettings/GKBJAF.ini
index 52868fcac9..e414b4d51e 100644
--- a/Data/Sys/GameSettings/GKBJAF.ini
+++ b/Data/Sys/GameSettings/GKBJAF.ini
@@ -28,6 +28,8 @@ PH_ZFar =
 
 [Video_Hacks]
 EFBAccessEnable = False
+EFBCopyEnable = True
+EFBToTextureEnable = False
 
 [Video_Settings]
 UseXFB = True
diff --git a/Data/Sys/GameSettings/GKBPAF.ini b/Data/Sys/GameSettings/GKBPAF.ini
index fd1ed802e7..e749e6a5c6 100644
--- a/Data/Sys/GameSettings/GKBPAF.ini
+++ b/Data/Sys/GameSettings/GKBPAF.ini
@@ -28,6 +28,8 @@ PH_ZFar =
 
 [Video_Hacks]
 EFBAccessEnable = False
+EFBCopyEnable = True
+EFBToTextureEnable = False
 
 [Video_Settings]
 UseXFB = True
diff --git a/Data/Sys/GameSettings/GSBJ8P.ini b/Data/Sys/GameSettings/GSBJ8P.ini
new file mode 100644
index 0000000000..3e6b87041d
--- /dev/null
+++ b/Data/Sys/GameSettings/GSBJ8P.ini
@@ -0,0 +1,19 @@
+# GSBJ8P - Sonic Adventure 2 Battle
+
+[Core]
+# Values set here will override the main dolphin settings.
+BlockMerging = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/GSNE8P.ini b/Data/Sys/GameSettings/GSNE8P.ini
index 227e34e4e5..ca69d39866 100644
--- a/Data/Sys/GameSettings/GSNE8P.ini
+++ b/Data/Sys/GameSettings/GSNE8P.ini
@@ -2,6 +2,7 @@
 
 [Core]
 # Values set here will override the main dolphin settings.
+BlockMerging = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GSNP8P.ini b/Data/Sys/GameSettings/GSNP8P.ini
index c83a83889c..a0e1448284 100644
--- a/Data/Sys/GameSettings/GSNP8P.ini
+++ b/Data/Sys/GameSettings/GSNP8P.ini
@@ -2,6 +2,7 @@
 
 [Core]
 # Values set here will override the main dolphin settings.
+BlockMerging = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/GXEE8P.ini b/Data/Sys/GameSettings/GXEE8P.ini
index 3c61da3c81..4e1c725408 100644
--- a/Data/Sys/GameSettings/GXEE8P.ini
+++ b/Data/Sys/GameSettings/GXEE8P.ini
@@ -2,10 +2,11 @@
 
 [Core]
 # Values set here will override the main dolphin settings.
+FastDiscSpeed = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
+EmulationIssues = Crashes after the third story mode race without speed up disk transfer.
 EmulationStateId = 4
 
 [OnLoad]
@@ -16,7 +17,3 @@ EmulationStateId = 4
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video]
-ProjectionHack = 0
-
diff --git a/Data/Sys/GameSettings/GXEJ8P.ini b/Data/Sys/GameSettings/GXEJ8P.ini
new file mode 100644
index 0000000000..9ae50c21ba
--- /dev/null
+++ b/Data/Sys/GameSettings/GXEJ8P.ini
@@ -0,0 +1,19 @@
+# GXEJ8P - SonicRiders
+
+[Core]
+# Values set here will override the main dolphin settings.
+FastDiscSpeed = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Crashes after the third story mode race without speed up disk transfer.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
diff --git a/Data/Sys/GameSettings/GXEP8P.ini b/Data/Sys/GameSettings/GXEP8P.ini
index f7cd7b2174..db9c30ab53 100644
--- a/Data/Sys/GameSettings/GXEP8P.ini
+++ b/Data/Sys/GameSettings/GXEP8P.ini
@@ -2,9 +2,11 @@
 
 [Core]
 # Values set here will override the main dolphin settings.
+FastDiscSpeed = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Crashes after the third story mode race without speed up disk transfer.
 EmulationStateId = 4
 
 [OnLoad]
diff --git a/Data/Sys/GameSettings/GXSE8P.ini b/Data/Sys/GameSettings/GXSE8P.ini
index 3be2500a01..a0397cb21b 100644
--- a/Data/Sys/GameSettings/GXSE8P.ini
+++ b/Data/Sys/GameSettings/GXSE8P.ini
@@ -1,7 +1,8 @@
-# GXSE8P - SonicAdventureDX
+# GXSE8P - Sonic Adventure DX
 
 [Core]
 # Values set here will override the main dolphin settings.
+BlockMerging = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -20,3 +21,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GXSP6W.ini b/Data/Sys/GameSettings/GXSP6W.ini
new file mode 100644
index 0000000000..b83ab2b1d2
--- /dev/null
+++ b/Data/Sys/GameSettings/GXSP6W.ini
@@ -0,0 +1,25 @@
+# GXSP6W - Sonic Adventure DX
+
+[Core]
+# Values set here will override the main dolphin settings.
+BlockMerging = True
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/GXSP8P.ini b/Data/Sys/GameSettings/GXSP8P.ini
index 7293efdff4..ba69ecd4d3 100644
--- a/Data/Sys/GameSettings/GXSP8P.ini
+++ b/Data/Sys/GameSettings/GXSP8P.ini
@@ -1,10 +1,12 @@
-# GXSP8P - SonicAdventureDX
+# GXSP8P - Sonic Adventure DX
 
 [Core]
 # Values set here will override the main dolphin settings.
+BlockMerging = True
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
 EmulationIssues =
 
 [OnLoad]
@@ -48,3 +50,5 @@ $All Emblems
 038C294C 18000000
 043594E8 388000FF
 
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/RNJE4F.ini b/Data/Sys/GameSettings/RNJE4F.ini
new file mode 100644
index 0000000000..0bf5cb6c31
--- /dev/null
+++ b/Data/Sys/GameSettings/RNJE4F.ini
@@ -0,0 +1,21 @@
+# RNJE4F - Mini Ninjas
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/RNJP4F.ini b/Data/Sys/GameSettings/RNJP4F.ini
new file mode 100644
index 0000000000..f409085855
--- /dev/null
+++ b/Data/Sys/GameSettings/RNJP4F.ini
@@ -0,0 +1,21 @@
+# RNJP4F - Mini Ninjas
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/SOUE01.ini b/Data/Sys/GameSettings/SOUE01.ini
index 9f1090a7e2..38a344f32e 100644
--- a/Data/Sys/GameSettings/SOUE01.ini
+++ b/Data/Sys/GameSettings/SOUE01.ini
@@ -18,3 +18,4 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Hacks]
 EFBAccessEnable = True
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SOUJ01.ini b/Data/Sys/GameSettings/SOUJ01.ini
index 037f36f1b2..04f4082fde 100644
--- a/Data/Sys/GameSettings/SOUJ01.ini
+++ b/Data/Sys/GameSettings/SOUJ01.ini
@@ -18,3 +18,4 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Hacks]
 EFBAccessEnable = True
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SOUK01.ini b/Data/Sys/GameSettings/SOUK01.ini
index afff3ba808..3a2c311835 100644
--- a/Data/Sys/GameSettings/SOUK01.ini
+++ b/Data/Sys/GameSettings/SOUK01.ini
@@ -18,3 +18,4 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Hacks]
 EFBAccessEnable = True
+EFBEmulateFormatChanges = True
diff --git a/Data/Sys/GameSettings/SOUP01.ini b/Data/Sys/GameSettings/SOUP01.ini
index 10ac2a3cf4..5404ddd713 100644
--- a/Data/Sys/GameSettings/SOUP01.ini
+++ b/Data/Sys/GameSettings/SOUP01.ini
@@ -18,3 +18,4 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Hacks]
 EFBAccessEnable = True
+EFBEmulateFormatChanges = True

From 40bba500b524c5a91804211babd728e05f475a9d Mon Sep 17 00:00:00 2001
From: Linktothepast <kostamarino@gmail.com>
Date: Sat, 26 Apr 2014 21:47:03 +0300
Subject: [PATCH 2/2] More updates.

For 007: Agent Under Fire (gc), SHADOW THE HEDGEHOG (gc), NFL Street
(gc), NFL Street 2 (gc), NBA STREET V3 (gc).
Fixes issues 7224, 7216 and 7238.
---
 Data/Sys/GameSettings/G3VE69.ini |  1 +
 Data/Sys/GameSettings/G3VP69.ini | 19 +++++++++++++++++++
 Data/Sys/GameSettings/GN7E69.ini | 23 +++++++++++++++++++++++
 Data/Sys/GameSettings/GN7P69.ini | 23 +++++++++++++++++++++++
 Data/Sys/GameSettings/GNNE69.ini |  5 +++--
 Data/Sys/GameSettings/GNNP69.ini | 26 ++++++++++++++++++++++++++
 Data/Sys/GameSettings/GUPE8P.ini |  5 ++++-
 Data/Sys/GameSettings/GUPJ8P.ini | 25 +++++++++++++++++++++++++
 Data/Sys/GameSettings/GUPP8P.ini |  7 +++++++
 Data/Sys/GameSettings/GW7D69.ini | 25 +++++++++++++++++++++++++
 Data/Sys/GameSettings/GW7E69.ini |  7 +++++--
 Data/Sys/GameSettings/GW7F69.ini | 25 +++++++++++++++++++++++++
 Data/Sys/GameSettings/GW7P69.ini | 11 +++++++++--
 13 files changed, 195 insertions(+), 7 deletions(-)
 create mode 100644 Data/Sys/GameSettings/G3VP69.ini
 create mode 100644 Data/Sys/GameSettings/GN7E69.ini
 create mode 100644 Data/Sys/GameSettings/GN7P69.ini
 create mode 100644 Data/Sys/GameSettings/GNNP69.ini
 create mode 100644 Data/Sys/GameSettings/GUPJ8P.ini
 create mode 100644 Data/Sys/GameSettings/GW7D69.ini
 create mode 100644 Data/Sys/GameSettings/GW7F69.ini

diff --git a/Data/Sys/GameSettings/G3VE69.ini b/Data/Sys/GameSettings/G3VE69.ini
index 2706350566..0b2eef0162 100644
--- a/Data/Sys/GameSettings/G3VE69.ini
+++ b/Data/Sys/GameSettings/G3VE69.ini
@@ -2,6 +2,7 @@
 
 [Core]
 # Values set here will override the main dolphin settings.
+TLBHack=1
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
diff --git a/Data/Sys/GameSettings/G3VP69.ini b/Data/Sys/GameSettings/G3VP69.ini
new file mode 100644
index 0000000000..687e0d753d
--- /dev/null
+++ b/Data/Sys/GameSettings/G3VP69.ini
@@ -0,0 +1,19 @@
+# G3VP69 - NBA STREET V3
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack=1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
diff --git a/Data/Sys/GameSettings/GN7E69.ini b/Data/Sys/GameSettings/GN7E69.ini
new file mode 100644
index 0000000000..bc24454e45
--- /dev/null
+++ b/Data/Sys/GameSettings/GN7E69.ini
@@ -0,0 +1,23 @@
+# GN7E69 - NFL STREET 2
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GN7P69.ini b/Data/Sys/GameSettings/GN7P69.ini
new file mode 100644
index 0000000000..cbaf42c62a
--- /dev/null
+++ b/Data/Sys/GameSettings/GN7P69.ini
@@ -0,0 +1,23 @@
+# GN7P69 - NFL STREET 2
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNNE69.ini b/Data/Sys/GameSettings/GNNE69.ini
index 67477fc26c..f1bb8d9c7a 100644
--- a/Data/Sys/GameSettings/GNNE69.ini
+++ b/Data/Sys/GameSettings/GNNE69.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = Needs real xfb for the videos to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -22,4 +22,5 @@ ProjectionHack = 0
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GNNP69.ini b/Data/Sys/GameSettings/GNNP69.ini
new file mode 100644
index 0000000000..74fe733806
--- /dev/null
+++ b/Data/Sys/GameSettings/GNNP69.ini
@@ -0,0 +1,26 @@
+# GNNP69 - NFL Street
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GUPE8P.ini b/Data/Sys/GameSettings/GUPE8P.ini
index 2158c181d7..042dc50d6f 100644
--- a/Data/Sys/GameSettings/GUPE8P.ini
+++ b/Data/Sys/GameSettings/GUPE8P.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues =
+EmulationIssues = 2P mode is playable only with EFB to RAM.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -20,3 +20,6 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GUPJ8P.ini b/Data/Sys/GameSettings/GUPJ8P.ini
new file mode 100644
index 0000000000..aaa4944a53
--- /dev/null
+++ b/Data/Sys/GameSettings/GUPJ8P.ini
@@ -0,0 +1,25 @@
+# GUPJ8P - SHADOW THE HEDGEHOG
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 2P mode is playable only with EFB to RAM.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GUPP8P.ini b/Data/Sys/GameSettings/GUPP8P.ini
index 681d40341c..ad786bb97d 100644
--- a/Data/Sys/GameSettings/GUPP8P.ini
+++ b/Data/Sys/GameSettings/GUPP8P.ini
@@ -6,6 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
+EmulationIssues = 2P mode is playable only with EFB to RAM.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,3 +17,9 @@ EmulationStateId = 4
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video]
+ProjectionHack = 0
+
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GW7D69.ini b/Data/Sys/GameSettings/GW7D69.ini
new file mode 100644
index 0000000000..3e5d642254
--- /dev/null
+++ b/Data/Sys/GameSettings/GW7D69.ini
@@ -0,0 +1,25 @@
+# GW7D69 - 007: Agent Under Fire (tm)
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the video cutscenes to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GW7E69.ini b/Data/Sys/GameSettings/GW7E69.ini
index 8cdb4ec147..4984afe3b1 100644
--- a/Data/Sys/GameSettings/GW7E69.ini
+++ b/Data/Sys/GameSettings/GW7E69.ini
@@ -5,8 +5,8 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the video cutscenes to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -20,3 +20,6 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GW7F69.ini b/Data/Sys/GameSettings/GW7F69.ini
new file mode 100644
index 0000000000..2f4b002584
--- /dev/null
+++ b/Data/Sys/GameSettings/GW7F69.ini
@@ -0,0 +1,25 @@
+# GW7F69 - 007: Agent Under Fire (tm)
+
+[Core]
+# Values set here will override the main dolphin settings.
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the video cutscenes to display.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/Sys/GameSettings/GW7P69.ini b/Data/Sys/GameSettings/GW7P69.ini
index d062875728..1b649999f7 100644
--- a/Data/Sys/GameSettings/GW7P69.ini
+++ b/Data/Sys/GameSettings/GW7P69.ini
@@ -1,11 +1,12 @@
-# GW7P69 - one inch punch
+# GW7P69 - 007: Agent Under Fire (tm)
 
 [Core]
 # Values set here will override the main dolphin settings.
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues =
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the video cutscenes to display.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -16,3 +17,9 @@ EmulationIssues =
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video]
+ProjectionHack = 0
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True