From f2848b6a2554dd9bbd7ff91f45e1a8622882fda9 Mon Sep 17 00:00:00 2001
From: "kostamarino@hotmail.com" <kostamarino@hotmail.com>
Date: Tue, 23 Aug 2011 19:51:20 +0300
Subject: [PATCH] Revert gameini database to an older state before texcache
 rewrite was integrated. Some commits that followed will be properly done at a
 later point.

---
 Data/User/GameConfig/FBYE01.ini |   3 +-
 Data/User/GameConfig/G2ME01.ini |  21 ++---
 Data/User/GameConfig/G2MP01.ini | 151 +++-----------------------------
 Data/User/GameConfig/G2OE41.ini |   4 +
 Data/User/GameConfig/G2OP41.ini |   2 +
 Data/User/GameConfig/G3AD69.ini |   2 +
 Data/User/GameConfig/G3AE69.ini |   3 +
 Data/User/GameConfig/G3AF69.ini |   4 +-
 Data/User/GameConfig/G3AP69.ini |   2 +
 Data/User/GameConfig/G3FE69.ini |   3 +
 Data/User/GameConfig/G3FF69.ini |   3 +
 Data/User/GameConfig/G3FP69.ini |   3 +
 Data/User/GameConfig/G3XE52.ini |   4 +
 Data/User/GameConfig/G3XP52.ini |   4 +-
 Data/User/GameConfig/G4ME69.ini |   3 +
 Data/User/GameConfig/G4MP69.ini |   2 +
 Data/User/GameConfig/G4QP01.ini |   2 +-
 Data/User/GameConfig/G4SE01.ini |   3 +
 Data/User/GameConfig/G4SP01.ini |   2 +
 Data/User/GameConfig/G6TE5G.ini |   4 +-
 Data/User/GameConfig/G6TP5G.ini |   3 +-
 Data/User/GameConfig/G8WP01.ini |   3 +-
 Data/User/GameConfig/G9SE8P.ini |   4 +-
 Data/User/GameConfig/G9SJ8P.ini |   4 +-
 Data/User/GameConfig/G9SP8P.ini |   4 +-
 Data/User/GameConfig/GAFE01.ini |   3 +
 Data/User/GameConfig/GAFJ01.ini |   3 +
 Data/User/GameConfig/GAFP01.ini |   3 +
 Data/User/GameConfig/GAFU01.ini |   3 +
 Data/User/GameConfig/GAUE08.ini |   7 +-
 Data/User/GameConfig/GAUJ08.ini |   6 +-
 Data/User/GameConfig/GAVE78.ini |   6 +-
 Data/User/GameConfig/GBVE41.ini |   8 +-
 Data/User/GameConfig/GBVP41.ini |   8 +-
 Data/User/GameConfig/GBZP08.ini |  62 +------------
 Data/User/GameConfig/GC6E01.ini |   3 +
 Data/User/GameConfig/GC6P01.ini |   2 +
 Data/User/GameConfig/GC9P6S.ini |   6 +-
 Data/User/GameConfig/GCCE01.ini |   5 ++
 Data/User/GameConfig/GCCP01.ini |   3 +
 Data/User/GameConfig/GCTP51.ini |   2 +
 Data/User/GameConfig/GCZE69.ini |   5 ++
 Data/User/GameConfig/GCZP69.ini |   5 +-
 Data/User/GameConfig/GDEE71.ini |   4 +
 Data/User/GameConfig/GDGE7H.ini |  16 ----
 Data/User/GameConfig/GDGP78.ini |  12 +--
 Data/User/GameConfig/GDLEA4.ini |   3 +-
 Data/User/GameConfig/GEAE8P.ini |   7 +-
 Data/User/GameConfig/GEAP8P.ini |   5 +-
 Data/User/GameConfig/GEDE01.ini |   4 +
 Data/User/GameConfig/GEDP01.ini |   4 +
 Data/User/GameConfig/GENE69.ini |   2 +
 Data/User/GameConfig/GENS69.ini |   3 +-
 Data/User/GameConfig/GEOE08.ini |   4 +
 Data/User/GameConfig/GEOP08.ini |   6 +-
 Data/User/GameConfig/GEZE8P.ini |   7 ++
 Data/User/GameConfig/GEZP8P.ini |   7 ++
 Data/User/GameConfig/GF5E69.ini |   2 +
 Data/User/GameConfig/GF6E69.ini |   2 +
 Data/User/GameConfig/GF6F69.ini |   3 +-
 Data/User/GameConfig/GF7E01.ini |   2 +
 Data/User/GameConfig/GF7P01.ini |   2 +
 Data/User/GameConfig/GFYE69.ini |   3 +
 Data/User/GameConfig/GFYP69.ini |   2 +
 Data/User/GameConfig/GFZE01.ini |   8 +-
 Data/User/GameConfig/GFZP01.ini |   8 +-
 Data/User/GameConfig/GGSEA4.ini |   3 +
 Data/User/GameConfig/GGSJA4.ini |   2 +
 Data/User/GameConfig/GGSPA4.ini | 108 +----------------------
 Data/User/GameConfig/GGYE41.ini |   2 +
 Data/User/GameConfig/GGYP41.ini |   2 +-
 Data/User/GameConfig/GGZE52.ini |  15 +---
 Data/User/GameConfig/GGZX52.ini |  21 -----
 Data/User/GameConfig/GHBE7D.ini |  16 ----
 Data/User/GameConfig/GHBP7D.ini |  16 ----
 Data/User/GameConfig/GIKE70.ini |   3 +-
 Data/User/GameConfig/GIKP70.ini |   3 +-
 Data/User/GameConfig/GILE51.ini |   3 +
 Data/User/GameConfig/GILP51.ini |   3 +
 Data/User/GameConfig/GJ3PA4.ini |   4 +-
 Data/User/GameConfig/GJXE51.ini |   3 +
 Data/User/GameConfig/GK5E78.ini |   3 +
 Data/User/GameConfig/GKLE69.ini |   3 +-
 Data/User/GameConfig/GKLF69.ini |   3 +-
 Data/User/GameConfig/GKLP69.ini |   3 +
 Data/User/GameConfig/GKLS69.ini |   3 +-
 Data/User/GameConfig/GKME41.ini |   3 +
 Data/User/GameConfig/GKOE70.ini |   4 +-
 Data/User/GameConfig/GKOP70.ini |   3 +-
 Data/User/GameConfig/GKUE9G.ini |   4 +-
 Data/User/GameConfig/GLCE52.ini |   1 +
 Data/User/GameConfig/GM5E7D.ini |   3 +
 Data/User/GameConfig/GM5F7D.ini |   3 +
 Data/User/GameConfig/GM5P7D.ini |   3 +
 Data/User/GameConfig/GM6EE9.ini |   4 +-
 Data/User/GameConfig/GM6PE9.ini |   3 +
 Data/User/GameConfig/GM8E01.ini |   8 +-
 Data/User/GameConfig/GM8J01.ini |   8 +-
 Data/User/GameConfig/GM8P01.ini |   8 +-
 Data/User/GameConfig/GMSE01.ini |   3 +-
 Data/User/GameConfig/GMSJ01.ini |  23 -----
 Data/User/GameConfig/GMSP01.ini |  14 +--
 Data/User/GameConfig/GN6E69.ini |  16 ----
 Data/User/GameConfig/GNNE69.ini |   2 +
 Data/User/GameConfig/GNOE78.ini |   4 +-
 Data/User/GameConfig/GOYD69.ini |   3 +
 Data/User/GameConfig/GOYE69.ini |   3 +
 Data/User/GameConfig/GPHE52.ini |   4 +-
 Data/User/GameConfig/GPOE8P.ini |   3 +
 Data/User/GameConfig/GPOP8P.ini |   4 +-
 Data/User/GameConfig/GPSP8P.ini |   4 +-
 Data/User/GameConfig/GQSDAF.ini |   2 +
 Data/User/GameConfig/GQSEAF.ini |   3 +
 Data/User/GameConfig/GQSFAF.ini |   2 +
 Data/User/GameConfig/GQSPAF.ini |   2 +
 Data/User/GameConfig/GRKE41.ini |   2 +
 Data/User/GameConfig/GRKP7G.ini |   1 +
 Data/User/GameConfig/GRSPAF.ini |   1 +
 Data/User/GameConfig/GT6E70.ini |   2 +
 Data/User/GameConfig/GT7E41.ini |   2 +
 Data/User/GameConfig/GT7P41.ini |   3 +-
 Data/User/GameConfig/GT7X41.ini |   3 +-
 Data/User/GameConfig/GTEE01.ini |  10 +--
 Data/User/GameConfig/GTEP01.ini |   2 -
 Data/User/GameConfig/GTKP51.ini |   3 +
 Data/User/GameConfig/GWWP01.ini |  39 ---------
 Data/User/GameConfig/GWYE41.ini |   1 +
 Data/User/GameConfig/GXNE5D.ini |   3 +
 Data/User/GameConfig/GXXE01.ini |   2 +
 Data/User/GameConfig/GXXP01.ini |   3 +
 Data/User/GameConfig/GZ2E01.ini |   6 ++
 Data/User/GameConfig/GZ2J01.ini |   8 ++
 Data/User/GameConfig/GZ2P01.ini |   7 +-
 Data/User/GameConfig/GZEE70.ini |   3 +
 Data/User/GameConfig/GZLE01.ini |   4 +-
 Data/User/GameConfig/GZLJ01.ini |   4 +-
 Data/User/GameConfig/GZLP01.ini |   3 +-
 Data/User/GameConfig/GZWE01.ini |   3 +
 Data/User/GameConfig/HACA01.ini |   2 +
 Data/User/GameConfig/R3NEXS.ini |   3 +
 Data/User/GameConfig/R3OE01.ini |   3 +
 Data/User/GameConfig/R3OJ01.ini |   2 +
 Data/User/GameConfig/R3OP01.ini |   2 +
 Data/User/GameConfig/R5IE4Q.ini |   2 +
 Data/User/GameConfig/R5IX4Q.ini |   2 +
 Data/User/GameConfig/R5WEA4.ini |   6 +-
 Data/User/GameConfig/R5WJA4.ini |   9 +-
 Data/User/GameConfig/R6YPH3.ini |   4 +-
 Data/User/GameConfig/R7EE8P.ini |   3 +
 Data/User/GameConfig/R7EJ8P.ini |   3 +
 Data/User/GameConfig/R7EP8P.ini |   3 +
 Data/User/GameConfig/R84EE9.ini |   3 +
 Data/User/GameConfig/R84P99.ini |   3 +
 Data/User/GameConfig/RBBE18.ini |   3 +
 Data/User/GameConfig/RBBJ18.ini |   3 +
 Data/User/GameConfig/RBBP99.ini |   3 +
 Data/User/GameConfig/RBHE08.ini |   3 +
 Data/User/GameConfig/RBHJ08.ini |   5 +-
 Data/User/GameConfig/RBHP08.ini |   3 +
 Data/User/GameConfig/RDBPAF.ini |   3 +
 Data/User/GameConfig/RDSE70.ini |   4 +
 Data/User/GameConfig/RDSJAF.ini |   2 +
 Data/User/GameConfig/RDSPAF.ini |   4 +-
 Data/User/GameConfig/RFCEGD.ini |   3 +
 Data/User/GameConfig/RFCPGD.ini |   4 +-
 Data/User/GameConfig/RFFEGD.ini |   3 +
 Data/User/GameConfig/RFFJGD.ini |   1 +
 Data/User/GameConfig/RFFPGD.ini |   1 +
 Data/User/GameConfig/RFQP69.ini |   2 +
 Data/User/GameConfig/RHOE8P.ini |   8 +-
 Data/User/GameConfig/RHOJ8P.ini |   3 +-
 Data/User/GameConfig/RHOP8P.ini |   2 -
 Data/User/GameConfig/RIPEAF.ini |   3 +
 Data/User/GameConfig/RIPJAF.ini |   2 +
 Data/User/GameConfig/RIPPAF.ini |   2 +
 Data/User/GameConfig/RIUJAF.ini |   2 +
 Data/User/GameConfig/RIUPAF.ini |   3 +
 Data/User/GameConfig/RK2EEB.ini |   3 +
 Data/User/GameConfig/RK2JEB.ini |   2 +
 Data/User/GameConfig/RK2P01.ini |   4 +-
 Data/User/GameConfig/RKDEEB.ini |   3 +
 Data/User/GameConfig/RKDP01.ini |   2 +
 Data/User/GameConfig/RKDPEB.ini |   4 +-
 Data/User/GameConfig/RM3E01.ini |   8 +-
 Data/User/GameConfig/RM3J01.ini |   8 +-
 Data/User/GameConfig/RM3P01.ini |   8 +-
 Data/User/GameConfig/RNHE41.ini |  14 +--
 Data/User/GameConfig/RNOJ01.ini |   6 +-
 Data/User/GameConfig/RNOP01.ini |   7 +-
 Data/User/GameConfig/ROLE8P.ini |   3 +
 Data/User/GameConfig/ROUJAF.ini |   2 +
 Data/User/GameConfig/ROUPAF.ini |   3 +
 Data/User/GameConfig/ROWE08.ini |   7 +-
 Data/User/GameConfig/ROWJ08.ini |   7 +-
 Data/User/GameConfig/ROWP08.ini |   9 +-
 Data/User/GameConfig/RPBE01.ini |   6 +-
 Data/User/GameConfig/RPBJ01.ini |   7 +-
 Data/User/GameConfig/RPBP01.ini |   5 +-
 Data/User/GameConfig/RPJE7U.ini |   3 +
 Data/User/GameConfig/RPJJ99.ini |   3 +
 Data/User/GameConfig/RQ6EJJ.ini |   3 +
 Data/User/GameConfig/RQ6PKM.ini |   3 +
 Data/User/GameConfig/RQ6XKM.ini |   3 +
 Data/User/GameConfig/RQREXJ.ini |   3 +
 Data/User/GameConfig/RQRJAF.ini |   3 +
 Data/User/GameConfig/RQRPAF.ini |   3 +
 Data/User/GameConfig/RRBE41.ini |  13 +--
 Data/User/GameConfig/RRBJ41.ini |  17 ----
 Data/User/GameConfig/RRBP41.ini |  17 ----
 Data/User/GameConfig/RRKE70.ini |   3 +
 Data/User/GameConfig/RRKP70.ini |   3 +
 Data/User/GameConfig/RSLEAF.ini |   3 +
 Data/User/GameConfig/RSLJAF.ini |   3 +
 Data/User/GameConfig/RSLKAF.ini |   3 +
 Data/User/GameConfig/RSLPAF.ini |   3 +
 Data/User/GameConfig/RSXE69.ini |  15 +---
 Data/User/GameConfig/RSXJ13.ini |  20 -----
 Data/User/GameConfig/RSXK69.ini |  20 -----
 Data/User/GameConfig/RSXP69.ini |  10 +--
 Data/User/GameConfig/RUYE41.ini |  10 +--
 Data/User/GameConfig/RX3E01.ini |   3 +
 Data/User/GameConfig/RZDE01.ini |   3 +
 Data/User/GameConfig/RZDJ01.ini |   4 +-
 Data/User/GameConfig/RZDK01.ini |   4 +-
 Data/User/GameConfig/RZDP01.ini |   4 +-
 Data/User/GameConfig/RZJD69.ini |   2 +
 Data/User/GameConfig/RZJE69.ini |   3 +
 Data/User/GameConfig/RZJJ13.ini |   2 +
 Data/User/GameConfig/RZJP69.ini |   4 +-
 Data/User/GameConfig/S2WE78.ini |   3 +
 Data/User/GameConfig/S2WP78.ini |   3 +
 Data/User/GameConfig/S3BEWR.ini |   3 +
 Data/User/GameConfig/S3BPWR.ini |   3 +
 Data/User/GameConfig/S59E01.ini |   4 +-
 Data/User/GameConfig/S59JC8.ini |   4 +-
 Data/User/GameConfig/S59P01.ini |   3 +
 Data/User/GameConfig/S75E69.ini |   2 +
 Data/User/GameConfig/S75P69.ini |   1 +
 Data/User/GameConfig/SAKENS.ini |   3 +
 Data/User/GameConfig/SAKPNS.ini |   4 +-
 Data/User/GameConfig/SB3E08.ini |   3 +-
 Data/User/GameConfig/SB3J08.ini |   3 +-
 Data/User/GameConfig/SB3P08.ini |   3 +-
 Data/User/GameConfig/SBDE08.ini |   5 +-
 Data/User/GameConfig/SBDJ08.ini |   2 +
 Data/User/GameConfig/SBDK08.ini |   2 +
 Data/User/GameConfig/SBDP08.ini |   2 +
 Data/User/GameConfig/SCAE18.ini |   3 +
 Data/User/GameConfig/SCAJ18.ini |   3 +
 Data/User/GameConfig/SCAP18.ini |   3 +
 Data/User/GameConfig/SD2E41.ini |   3 +
 Data/User/GameConfig/SD2P41.ini |   3 +
 Data/User/GameConfig/SD2Y41.ini |   3 +
 Data/User/GameConfig/SDWE18.ini |   6 +-
 Data/User/GameConfig/SDWJ18.ini |   4 +-
 Data/User/GameConfig/SDWP18.ini |   5 +-
 Data/User/GameConfig/SE2P69.ini |   2 +
 Data/User/GameConfig/SEAE69.ini |   2 +
 Data/User/GameConfig/SEAJ13.ini |   2 +
 Data/User/GameConfig/SEAP69.ini |   2 +
 Data/User/GameConfig/SEME4Q.ini |   3 +
 Data/User/GameConfig/SEMP4Q.ini |   3 +
 Data/User/GameConfig/SEMX4Q.ini |   3 +
 Data/User/GameConfig/SF8E01.ini |   3 +
 Data/User/GameConfig/SF8J01.ini |   3 +
 Data/User/GameConfig/SF8P01.ini |   3 +
 Data/User/GameConfig/SFWP69.ini |   2 +
 Data/User/GameConfig/SHLPA4.ini |  17 ----
 Data/User/GameConfig/SILE78.ini |   3 +
 Data/User/GameConfig/SILP78.ini |   5 +-
 Data/User/GameConfig/SK3EEB.ini |   3 +
 Data/User/GameConfig/SMFE4Q.ini |  20 -----
 Data/User/GameConfig/SMNE01.ini |   2 +
 Data/User/GameConfig/SMNJ01.ini |   2 +
 Data/User/GameConfig/SMNK01.ini |   2 +
 Data/User/GameConfig/SMNP01.ini |   3 +
 Data/User/GameConfig/SMNW01.ini |   2 +
 Data/User/GameConfig/SNJE69.ini |   3 +
 Data/User/GameConfig/SNJP69.ini |   2 +
 Data/User/GameConfig/SPTJEB.ini |   4 +-
 Data/User/GameConfig/SPVEA4.ini |   3 +
 Data/User/GameConfig/SPVPA4.ini |   3 +
 Data/User/GameConfig/SPVXA4.ini |   3 +
 Data/User/GameConfig/SPVYA4.ini |   3 +
 Data/User/GameConfig/SVME01.ini |   5 +-
 Data/User/GameConfig/SVMJ01.ini |   6 +-
 Data/User/GameConfig/SVMP01.ini |   5 +-
 Data/User/GameConfig/SXCE52.ini |   4 +
 Data/User/GameConfig/SXCP52.ini |   2 +
 Data/User/GameConfig/WF4EGD.ini |   2 +
 Data/User/GameConfig/WR9E08.ini |   4 +-
 Data/User/GameConfig/WR9P08.ini |   4 +-
 Data/User/GameConfig/WRXE08.ini |   2 +
 293 files changed, 813 insertions(+), 828 deletions(-)
 delete mode 100644 Data/User/GameConfig/GDGE7H.ini
 delete mode 100644 Data/User/GameConfig/GGZX52.ini
 delete mode 100644 Data/User/GameConfig/GHBE7D.ini
 delete mode 100644 Data/User/GameConfig/GHBP7D.ini
 delete mode 100644 Data/User/GameConfig/GMSJ01.ini
 delete mode 100644 Data/User/GameConfig/GN6E69.ini
 delete mode 100644 Data/User/GameConfig/RRBJ41.ini
 delete mode 100644 Data/User/GameConfig/RRBP41.ini
 delete mode 100644 Data/User/GameConfig/RSXJ13.ini
 delete mode 100644 Data/User/GameConfig/RSXK69.ini
 delete mode 100644 Data/User/GameConfig/SHLPA4.ini
 delete mode 100644 Data/User/GameConfig/SMFE4Q.ini

diff --git a/Data/User/GameConfig/FBYE01.ini b/Data/User/GameConfig/FBYE01.ini
index d063d693df..e2fd280d27 100644
--- a/Data/User/GameConfig/FBYE01.ini
+++ b/Data/User/GameConfig/FBYE01.ini
@@ -4,4 +4,5 @@
 EmulationStateId = 3
 EmulationIssues = Can't see graphics
 [OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
\ No newline at end of file
+[ActionReplay] Add action replay cheats here.
+[Video]
\ No newline at end of file
diff --git a/Data/User/GameConfig/G2ME01.ini b/Data/User/GameConfig/G2ME01.ini
index 85e0398be5..d8807fcf07 100644
--- a/Data/User/GameConfig/G2ME01.ini
+++ b/Data/User/GameConfig/G2ME01.ini
@@ -2,6 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
+Issues="Scanner does not work, music is buggy, scanner mode is buggy"
 EmulationIssues = 
 [Speedhacks]
 0x803758bc=400
@@ -130,20 +131,6 @@ $Have Ing Hive Temple Key 2
 4241FD80 011B0001
 $Have Ing Hive Temple Key 3
 4241FD80 011F0001
-$One Hit Kill
-0403DB68 4BFC539C
-04002F04 FFC00090
-04002F08 7C1BE050
-04002F0C 2C000010
-04002F10 41820008
-04002F14 EFDEF028
-04002F18 4803AC54
-$Full Logbook
-0421166C 4BDF18CC
-04002F38 3BE000FF
-04002F3C 9BE50004
-04002F40 88050004
-04002F44 4820E72C
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -152,7 +139,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+EFBToTextureEnable = False
diff --git a/Data/User/GameConfig/G2MP01.ini b/Data/User/GameConfig/G2MP01.ini
index 9c969c6a9e..ca94aac829 100644
--- a/Data/User/GameConfig/G2MP01.ini
+++ b/Data/User/GameConfig/G2MP01.ini
@@ -1,147 +1,15 @@
-# G2MP01 - Metroid Prime 2 Echoes
-[EmuState]
+# G2MP01 - Metroid Prime 2 Echoes[EmuState]
 #The Emulation State.
-EmulationStateId = 4
-EmulationIssues = 
+EmulationStateId = 2
+Issues="Scanner does not work, music is buggy, scanner mode is buggy"
 [Speedhacks]
 #Patch OSYieldThread to take more time - MP2's idle loop is really stupid.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C43552C8 0000FF01
-C436F41C 0000FF02
-0D30294C 4E800020
-C530294C 0000FF03
-$Infinite Health
-423DDE0C 000A44BB
-423DDE0C 000B6000
-$Max Energy Tanks
-423DDE0C 012B000E
-423DDE0C 012D000E
-$Maximum Missiles
-423DDE0C 013900FA
-$Infinite Missiles
-423DDE0C 013700FA
-$Moon Jump (Hold B)
-3A705F24 00000200
-423DDDFC 00D84101
-$Have Charge Beam
-423DDE0C 00310001
-423DDE0C 00330001
-$Have Dark Beam
-423DDE0C 00370001
-423DDE0C 00390001
-$Have Light Beam
-423DDE0C 003D0001
-423DDE0C 003F0001
-$Have Annihilator
-423DDE0C 00430001
-423DDE0C 00450001
-$Have Super Missile
-423DDE0C 00470001
-423DDE0C 00490001
-$Have Darkburst
-423DDE0C 004D0001
-423DDE0C 004F0001
-$Have Sunburst
-423DDE0C 00530001
-423DDE0C 00550001
-$Have Sonic Boom
-423DDE0C 00590001
-423DDE0C 005B0001
-$Have Combat Visor
-423DDE0C 005F0001
-423DDE0C 00610001
-$Have Scan Visor
-423DDE0C 00650001
-423DDE0C 00670001
-$Have Dark Visor
-423DDE0C 006B0001
-423DDE0C 006D0001
-$Have Echo Visor
-423DDE0C 00710001
-423DDE0C 00730001
-$Have Varia Suit
-423DDE0C 00770001
-423DDE0C 00790001
-$Have Dark Suit
-423DDE0C 007D0001
-423DDE0C 007F0001
-$Have Light Suit
-423DDE0C 00830001
-423DDE0C 00850001
-$Have Space Jump Boots
-423DDE0C 00BF0001
-423DDE0C 00C10001
-$Have Grapple Beam
-423DDE0C 00B90001
-423DDE0C 00BB0001
-$Have Gravity Boost
-423DDE0C 00C50001
-423DDE0C 00C70001
-$Have Screw Attack
-423DDE0C 00D10001
-423DDE0C 00D30001
-$Have Seeker Missile
-423DDE0C 00CB0001
-423DDE0C 00CD0001
-$Have Morph Ball Power Bomb
-423DDE0C 01310001
-423DDE0C 01330001
-$Have Beam Ammo Expansion
-423DDE0C 013D000F
-423DDE0C 013F000F
-$Have Sky Temple Key 1
-423DDE0C 00DD0001
-423DDE0C 00DF0001
-$Have Sky Temple Key 2
-423DDE0C 00E30001
-423DDE0C 00E50001
-$Have Sky Temple Key 3
-423DDE0C 00E90001
-423DDE0C 00EB0001
-$Have Agon Temple Key 1
-423DDE0C 00EF0001
-423DDE0C 00F10001
-$Have Agon Temple Key 2
-423DDE0C 00F50001
-423DDE0C 00F70001
-$Have Agon Temple Key 3
-423DDE0C 00FB0001
-423DDE0C 00FD0001
-$Have Torvus Temple Key 1
-423DDE0C 01010001
-423DDE0C 01030001
-$Have Torvus Temple Key 2
-423DDE0C 01070001
-423DDE0C 01090001
-$Have Torvus Temple Key 3
-423DDE0C 010D0001
-423DDE0C 010F0001
-$Have Ing Hive Temple Key 1
-423DDE0C 01130001
-423DDE0C 01150001
-$Have Ing Hive Temple Key 2
-423DDE0C 01190001
-423DDE0C 011B0001
-$Have Ing Hive Temple Key 3
-423DDE0C 011F0001
-423DDE0C 01210001
-$One Hit Kill
-0403DCB8 4BFC524C
-04002F04 FFC00090
-04002F08 7C1BE050
-04002F0C 2C000010
-04002F10 41820008
-04002F14 EFDEF028
-04002F18 4803ADA4
-$Full Logbook
-04211974 4BDF15C4
-04002F38 3BE000FF
-04002F3C 9BE50004
-04002F40 88050004
-04002F44 4820EA34
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = needs safe texture cache and EFB to Ram
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -150,8 +18,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-
+EFBToTextureEnable = False
diff --git a/Data/User/GameConfig/G2OE41.ini b/Data/User/GameConfig/G2OE41.ini
index 920a6da175..38829382ef 100644
--- a/Data/User/GameConfig/G2OE41.ini
+++ b/Data/User/GameConfig/G2OE41.ini
@@ -14,3 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/G2OP41.ini b/Data/User/GameConfig/G2OP41.ini
index 2e0308f65f..e2afb7c0bd 100644
--- a/Data/User/GameConfig/G2OP41.ini
+++ b/Data/User/GameConfig/G2OP41.ini
@@ -9,3 +9,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G3AD69.ini b/Data/User/GameConfig/G3AD69.ini
index a9770ea9fb..01fbb79385 100644
--- a/Data/User/GameConfig/G3AD69.ini
+++ b/Data/User/GameConfig/G3AD69.ini
@@ -14,3 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G3AE69.ini b/Data/User/GameConfig/G3AE69.ini
index c736274351..50fa7af370 100644
--- a/Data/User/GameConfig/G3AE69.ini
+++ b/Data/User/GameConfig/G3AE69.ini
@@ -14,4 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/G3AF69.ini b/Data/User/GameConfig/G3AF69.ini
index e907d623a3..6096a11729 100644
--- a/Data/User/GameConfig/G3AF69.ini
+++ b/Data/User/GameConfig/G3AF69.ini
@@ -13,4 +13,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G3AP69.ini b/Data/User/GameConfig/G3AP69.ini
index bfc515250f..5956160dcb 100644
--- a/Data/User/GameConfig/G3AP69.ini
+++ b/Data/User/GameConfig/G3AP69.ini
@@ -14,3 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G3FE69.ini b/Data/User/GameConfig/G3FE69.ini
index 6be102c85f..09a9c6dc81 100644
--- a/Data/User/GameConfig/G3FE69.ini
+++ b/Data/User/GameConfig/G3FE69.ini
@@ -17,5 +17,8 @@ PH_ZFar =
 MMU = 1
 VBeam = 1
 BlockMerging = 1
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/G3FF69.ini b/Data/User/GameConfig/G3FF69.ini
index 83bb99085d..74e01bc005 100644
--- a/Data/User/GameConfig/G3FF69.ini
+++ b/Data/User/GameConfig/G3FF69.ini
@@ -17,5 +17,8 @@ PH_ZFar =
 MMU = 1
 VBeam = 1
 BlockMerging = 1
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/G3FP69.ini b/Data/User/GameConfig/G3FP69.ini
index a69c0e178c..cdb7e8478a 100644
--- a/Data/User/GameConfig/G3FP69.ini
+++ b/Data/User/GameConfig/G3FP69.ini
@@ -17,5 +17,8 @@ PH_ZFar =
 MMU = 1
 VBeam = 1
 BlockMerging = 1
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/G3XE52.ini b/Data/User/GameConfig/G3XE52.ini
index f925036f54..ad8d6a7476 100644
--- a/Data/User/GameConfig/G3XE52.ini
+++ b/Data/User/GameConfig/G3XE52.ini
@@ -14,3 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/G3XP52.ini b/Data/User/GameConfig/G3XP52.ini
index 93243c770d..e9b35a34c8 100644
--- a/Data/User/GameConfig/G3XP52.ini
+++ b/Data/User/GameConfig/G3XP52.ini
@@ -8,4 +8,6 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G4ME69.ini b/Data/User/GameConfig/G4ME69.ini
index babfa98df1..f082c8ca0d 100644
--- a/Data/User/GameConfig/G4ME69.ini
+++ b/Data/User/GameConfig/G4ME69.ini
@@ -14,4 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/G4MP69.ini b/Data/User/GameConfig/G4MP69.ini
index 84d5fa8ca8..a97f19579e 100644
--- a/Data/User/GameConfig/G4MP69.ini
+++ b/Data/User/GameConfig/G4MP69.ini
@@ -14,3 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G4QP01.ini b/Data/User/GameConfig/G4QP01.ini
index 69c9b75bbc..a78c574d22 100644
--- a/Data/User/GameConfig/G4QP01.ini
+++ b/Data/User/GameConfig/G4QP01.ini
@@ -1,5 +1,5 @@
 # G4QP01 - Mario Smash Football
-[Core] Values set here will override the main dolphin settings.
+
 [EmuState]
 #The Emulation State.
 EmulationStateId = 5
diff --git a/Data/User/GameConfig/G4SE01.ini b/Data/User/GameConfig/G4SE01.ini
index 18b82dee6b..a0ce7ade1e 100644
--- a/Data/User/GameConfig/G4SE01.ini
+++ b/Data/User/GameConfig/G4SE01.ini
@@ -13,4 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/G4SP01.ini b/Data/User/GameConfig/G4SP01.ini
index 44b98a823a..c6ac41749c 100644
--- a/Data/User/GameConfig/G4SP01.ini
+++ b/Data/User/GameConfig/G4SP01.ini
@@ -104,3 +104,5 @@ $Have Power Bracelet
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G6TE5G.ini b/Data/User/GameConfig/G6TE5G.ini
index 2b7b10225e..90f14427ed 100644
--- a/Data/User/GameConfig/G6TE5G.ini
+++ b/Data/User/GameConfig/G6TE5G.ini
@@ -14,4 +14,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/G6TP5G.ini b/Data/User/GameConfig/G6TP5G.ini
index 5483eebd17..6f32916865 100644
--- a/Data/User/GameConfig/G6TP5G.ini
+++ b/Data/User/GameConfig/G6TP5G.ini
@@ -14,4 +14,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/G8WP01.ini b/Data/User/GameConfig/G8WP01.ini
index 1fffe31938..afe5bd513d 100644
--- a/Data/User/GameConfig/G8WP01.ini
+++ b/Data/User/GameConfig/G8WP01.ini
@@ -13,4 +13,5 @@ $Invincible
 0752E977 08000000
 04338650 00000001
 $Infinite Time
-0752E978 08000000
\ No newline at end of file
+0752E978 08000000
+[Video]
\ No newline at end of file
diff --git a/Data/User/GameConfig/G9SE8P.ini b/Data/User/GameConfig/G9SE8P.ini
index e167be725e..94e91c3c37 100644
--- a/Data/User/GameConfig/G9SE8P.ini
+++ b/Data/User/GameConfig/G9SE8P.ini
@@ -2,7 +2,7 @@
 [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 = Use directx11 plugin set at 1x efb scale to deal with black textures.
+EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,5 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 EFBScale = 2
 
diff --git a/Data/User/GameConfig/G9SJ8P.ini b/Data/User/GameConfig/G9SJ8P.ini
index 298badced7..2eb543f7e8 100644
--- a/Data/User/GameConfig/G9SJ8P.ini
+++ b/Data/User/GameConfig/G9SJ8P.ini
@@ -2,7 +2,7 @@
 [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 = Use directx11 plugin set at 1x efb scale to deal with black textures.
+EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,4 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 EFBScale = 2
\ No newline at end of file
diff --git a/Data/User/GameConfig/G9SP8P.ini b/Data/User/GameConfig/G9SP8P.ini
index c99e4e9c98..db14e49d3e 100644
--- a/Data/User/GameConfig/G9SP8P.ini
+++ b/Data/User/GameConfig/G9SP8P.ini
@@ -2,7 +2,7 @@
 [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 = Use directx11 plugin set at 1x efb scale to deal with black textures.
+EmulationIssues = Use directx11 plugin set at 1x efb scale to deal with black textures. Safe texture cache to "safe" for some garbled text(r6479)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,4 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 EFBScale = 2
\ No newline at end of file
diff --git a/Data/User/GameConfig/GAFE01.ini b/Data/User/GameConfig/GAFE01.ini
index 055b9440e9..7c4daea517 100644
--- a/Data/User/GameConfig/GAFE01.ini
+++ b/Data/User/GameConfig/GAFE01.ini
@@ -316,5 +316,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/Data/User/GameConfig/GAFJ01.ini b/Data/User/GameConfig/GAFJ01.ini
index 0027141eb6..148a5ef15a 100644
--- a/Data/User/GameConfig/GAFJ01.ini
+++ b/Data/User/GameConfig/GAFJ01.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/Data/User/GameConfig/GAFP01.ini b/Data/User/GameConfig/GAFP01.ini
index 1930b4db5f..6a4effbf39 100644
--- a/Data/User/GameConfig/GAFP01.ini
+++ b/Data/User/GameConfig/GAFP01.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/Data/User/GameConfig/GAFU01.ini b/Data/User/GameConfig/GAFU01.ini
index 3ff5938f61..8d81be9e8b 100644
--- a/Data/User/GameConfig/GAFU01.ini
+++ b/Data/User/GameConfig/GAFU01.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 FastDiscSpeed = 1
diff --git a/Data/User/GameConfig/GAUE08.ini b/Data/User/GameConfig/GAUE08.ini
index 324e495f04..86c546a939 100644
--- a/Data/User/GameConfig/GAUE08.ini
+++ b/Data/User/GameConfig/GAUE08.ini
@@ -2,8 +2,9 @@
 [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 = 5
-EmulationIssues = Use Real XFB
+EmulationIssues = Use Real XFB and Safe texture cache
 [OnFrame] Add memory patches to be applied every frame here.
+[Video]
 [ActionReplay] Add action replay cheats here.
 $Master Code
 C40EBABC 0000FF00
@@ -57,4 +58,6 @@ $C-Stick Sends All Car Back To Start
 00000000 00070B60
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
\ No newline at end of file
+UseRealXFB = True
+SafeTextureCache = True
+
diff --git a/Data/User/GameConfig/GAUJ08.ini b/Data/User/GameConfig/GAUJ08.ini
index 5a865502d6..bf4a323cb7 100644
--- a/Data/User/GameConfig/GAUJ08.ini
+++ b/Data/User/GameConfig/GAUJ08.ini
@@ -2,9 +2,11 @@
 [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 = 5
-EmulationIssues = Use Real XFB
+EmulationIssues = Use Real XFB and Safe texture cache
 [OnFrame] Add memory patches to be applied every frame here.
+[Video]
 [ActionReplay] Add action replay cheats here.
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
\ No newline at end of file
+UseRealXFB = True
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GAVE78.ini b/Data/User/GameConfig/GAVE78.ini
index a50d36fca7..1e39963483 100644
--- a/Data/User/GameConfig/GAVE78.ini
+++ b/Data/User/GameConfig/GAVE78.ini
@@ -8,4 +8,8 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/GBVE41.ini b/Data/User/GameConfig/GBVE41.ini
index 311e239697..48873b44fb 100644
--- a/Data/User/GameConfig/GBVE41.ini
+++ b/Data/User/GameConfig/GBVE41.ini
@@ -1,4 +1,7 @@
 # GBVE41 - Batman: Vengeance
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
 [Core]
 [Video]
 ProjectionHack = 0
@@ -11,6 +14,5 @@ PH_ZFar =
 EmulationStateId = 3
 EmulationIssues = Needs Real xfb for videos to show up.(r7459)
 [OnFrame]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
\ No newline at end of file
+[ActionReplay]
+[Gecko]
diff --git a/Data/User/GameConfig/GBVP41.ini b/Data/User/GameConfig/GBVP41.ini
index 719a94e1e5..439ef14205 100644
--- a/Data/User/GameConfig/GBVP41.ini
+++ b/Data/User/GameConfig/GBVP41.ini
@@ -1,4 +1,7 @@
 # GBVP41 - Batman Vengeance
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
 [Core]
 [Video]
 ProjectionHack = 0
@@ -11,6 +14,5 @@ PH_ZFar =
 EmulationStateId = 3
 EmulationIssues = Needs Real xfb for videos to show up.(r7459)
 [OnFrame]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = True
\ No newline at end of file
+[ActionReplay]
+[Gecko]
diff --git a/Data/User/GameConfig/GBZP08.ini b/Data/User/GameConfig/GBZP08.ini
index d03534d7bf..b974a476b0 100644
--- a/Data/User/GameConfig/GBZP08.ini
+++ b/Data/User/GameConfig/GBZP08.ini
@@ -5,66 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Can always save
-04153E00 38000037
-04153A50 60000000
-$Zero saves
-0233B832 00000000
-$Have all maps
-022961C2 0000FFFF
-$Have all files
-022961C0 0000FFFB
-022961C6 0000FFFF
-$Timers don't decrease
-043835C0 00015F91
-$Infinite Ammo (All slots)
-04152D34 3BC00063
-04152D60 60000000
-$Infinite health (REBECCA)
-0431CA4C 00000100
-$Infinite Ammo [All Slots] (R)
-023272EA 00000063
-023272EE 00000063
-023272F2 00000063
-023272F6 00000063
-023272FA 00000063
-023272FE 00000063
-$Slot 1/2: Hunting gun (R)
-023272E8 00000005
-$Slot 1/2: Shotgun (R)
-023272E8 00000006
-$Slot 1/2: Grenade Launcher (R)
-023272E8 00000007
-$Slot 1/2: Sub-machine gun (R)
-023272E8 0000000B
-$Slot 1/2: Rocket Launcher (R)
-023272E8 00000017
-$Slot 3: Magnum Revolver (R)
-023272F0 00000016
-$Slot 4: Moltov cocktails (R)
-023272F4 0000000E
-$Infinite health (BILLY)
-0231CC76 00000100
-$Slot 1/2: Hunting gun (B)
-02327308 00000005
-$Slot 1/2: Shotgun (B)
-02327308 00000006
-$Slot 1/2: Grenade Launcher (B)
-02327308 00000007
-$Slot 1/2: Sub-machine gun (B)
-02327308 0000000B
-$Slot 1/2: Rocket Launcher (B)
-02327308 00000017
-$Slot 3: Magnum Revolver (B)
-02327310 00000016
-$Infinite Ammo [All Slots] (B)
-0232730A 00000063
-0232730E 00000063
-02327312 00000063
-02327316 00000063
-0232731A 00000063
-0232731E 00000063
-$Slot 4: Moltov cocktails (B)
-02327214 0000000E
 [Video]
+Hack = -1
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/User/GameConfig/GC6E01.ini
index 3ed1b740d7..f802ab00bb 100644
--- a/Data/User/GameConfig/GC6E01.ini
+++ b/Data/User/GameConfig/GC6E01.ini
@@ -15,3 +15,6 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/User/GameConfig/GC6P01.ini
index 50c34ce8e4..26c7ee2401 100644
--- a/Data/User/GameConfig/GC6P01.ini
+++ b/Data/User/GameConfig/GC6P01.ini
@@ -15,3 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GC9P6S.ini b/Data/User/GameConfig/GC9P6S.ini
index 8e661fb336..ce306fbb9a 100644
--- a/Data/User/GameConfig/GC9P6S.ini
+++ b/Data/User/GameConfig/GC9P6S.ini
@@ -3,6 +3,8 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Need ZTP BLoom Hack
+EmulationIssues = Need ZTP BLoom Hack and Safe Texture Cache
 [OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
\ No newline at end of file
+[ActionReplay] Add action replay cheats here.
+[Video_Settings]
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GCCE01.ini b/Data/User/GameConfig/GCCE01.ini
index a3387f2cdf..2e0dccc4c7 100644
--- a/Data/User/GameConfig/GCCE01.ini
+++ b/Data/User/GameConfig/GCCE01.ini
@@ -298,5 +298,10 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Enhancements]
+PostProcessingShader =
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/GCCP01.ini b/Data/User/GameConfig/GCCP01.ini
index 53ac244ca5..bd51e4c97e 100644
--- a/Data/User/GameConfig/GCCP01.ini
+++ b/Data/User/GameConfig/GCCP01.ini
@@ -15,5 +15,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/GCTP51.ini b/Data/User/GameConfig/GCTP51.ini
index fcc221a3dc..f4ebeb351b 100644
--- a/Data/User/GameConfig/GCTP51.ini
+++ b/Data/User/GameConfig/GCTP51.ini
@@ -4,4 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+[Gecko]
 
diff --git a/Data/User/GameConfig/GCZE69.ini b/Data/User/GameConfig/GCZE69.ini
index 00533030fc..eaba11ce0b 100644
--- a/Data/User/GameConfig/GCZE69.ini
+++ b/Data/User/GameConfig/GCZE69.ini
@@ -10,3 +10,8 @@ EmulationStateId = 4
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Enhancements]
+PostProcessingShader = 
diff --git a/Data/User/GameConfig/GCZP69.ini b/Data/User/GameConfig/GCZP69.ini
index f303e46a88..c37bc8827e 100644
--- a/Data/User/GameConfig/GCZP69.ini
+++ b/Data/User/GameConfig/GCZP69.ini
@@ -8,4 +8,7 @@ EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-ProjectionHack = 0
\ No newline at end of file
+ProjectionHack = 0
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GDEE71.ini b/Data/User/GameConfig/GDEE71.ini
index 94ebf4298d..fdc28586f1 100644
--- a/Data/User/GameConfig/GDEE71.ini
+++ b/Data/User/GameConfig/GDEE71.ini
@@ -14,3 +14,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GDGE7H.ini b/Data/User/GameConfig/GDGE7H.ini
deleted file mode 100644
index b7a2e00341..0000000000
--- a/Data/User/GameConfig/GDGE7H.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GDGE7H - Dragon's Lair 3D
-[Core] Values set here will override the main dolphin settings.
-MMU = 1
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs MMU (very slow due to that).
-[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 = 
-[Gecko]
diff --git a/Data/User/GameConfig/GDGP78.ini b/Data/User/GameConfig/GDGP78.ini
index 96c22063bd..c45b1c32ad 100644
--- a/Data/User/GameConfig/GDGP78.ini
+++ b/Data/User/GameConfig/GDGP78.ini
@@ -1,16 +1,6 @@
 # GDGP78 - Dragon's Lair 3D
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Needs MMU (very slow due to that).
+EmulationStateId = 2
 [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 = 
-[Gecko]
diff --git a/Data/User/GameConfig/GDLEA4.ini b/Data/User/GameConfig/GDLEA4.ini
index 85353cceff..4e8adde846 100644
--- a/Data/User/GameConfig/GDLEA4.ini
+++ b/Data/User/GameConfig/GDLEA4.ini
@@ -4,4 +4,5 @@
 EmulationStateId = 2
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
\ No newline at end of file
+[ActionReplay] Add action replay cheats here.
+[Video]
diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/User/GameConfig/GEAE8P.ini
index c4dfcde409..c032bc3e73 100644
--- a/Data/User/GameConfig/GEAE8P.ini
+++ b/Data/User/GameConfig/GEAE8P.ini
@@ -2,7 +2,7 @@
 [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 = Use direct3d 9 for less graphic glitches.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -11,6 +11,9 @@ PH_SZNear = 0
 PH_SZFar = 1
 PH_ExtraParam = 0
 PH_ZNear = 
-PH_ZFar = 1.95
+PH_ZFar = 1.99998
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/User/GameConfig/GEAP8P.ini
index ceb2520cc7..ff88026d45 100644
--- a/Data/User/GameConfig/GEAP8P.ini
+++ b/Data/User/GameConfig/GEAP8P.ini
@@ -2,7 +2,7 @@
 [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 = Use direct3d 9 for less graphic glitches.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -11,6 +11,7 @@ PH_SZNear = 0
 PH_SZFar = 1
 PH_ExtraParam = 0
 PH_ZNear = 
-PH_ZFar = 1.95
+PH_ZFar = 1.99998
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GEDE01.ini b/Data/User/GameConfig/GEDE01.ini
index aee645a35a..43454cf0b0 100644
--- a/Data/User/GameConfig/GEDE01.ini
+++ b/Data/User/GameConfig/GEDE01.ini
@@ -12,3 +12,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 5
 PH_ZFar = 0.15
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GEDP01.ini b/Data/User/GameConfig/GEDP01.ini
index 3d49a5f59d..f7ae147375 100644
--- a/Data/User/GameConfig/GEDP01.ini
+++ b/Data/User/GameConfig/GEDP01.ini
@@ -12,3 +12,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 5
 PH_ZFar = 0.15
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GENE69.ini b/Data/User/GameConfig/GENE69.ini
index 8972aacde5..b30dad3b14 100644
--- a/Data/User/GameConfig/GENE69.ini
+++ b/Data/User/GameConfig/GENE69.ini
@@ -8,3 +8,5 @@ EmulationStateId = 2
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+[Gecko]
+
diff --git a/Data/User/GameConfig/GENS69.ini b/Data/User/GameConfig/GENS69.ini
index 5f1570a279..8f89df5ec1 100644
--- a/Data/User/GameConfig/GENS69.ini
+++ b/Data/User/GameConfig/GENS69.ini
@@ -7,4 +7,5 @@ EmulationStateId = 2
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-ProjectionHack = 0
\ No newline at end of file
+ProjectionHack = 0
+[Gecko]
diff --git a/Data/User/GameConfig/GEOE08.ini b/Data/User/GameConfig/GEOE08.ini
index ff8c810ac0..060ad29139 100644
--- a/Data/User/GameConfig/GEOE08.ini
+++ b/Data/User/GameConfig/GEOE08.ini
@@ -8,6 +8,8 @@ EmulationIssues = GFX glitches
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 EFBScale = 0
 [Video]
 ProjectionHack = 0
@@ -16,3 +18,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
diff --git a/Data/User/GameConfig/GEOP08.ini b/Data/User/GameConfig/GEOP08.ini
index c40b35c994..a5e69b5b0f 100644
--- a/Data/User/GameConfig/GEOP08.ini
+++ b/Data/User/GameConfig/GEOP08.ini
@@ -8,6 +8,8 @@ EmulationIssues = GFX glitches
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 EFBScale = 0
 [Video]
 ProjectionHack = 0
@@ -15,4 +17,6 @@ PH_SZNear = 0
 PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
-PH_ZFar = 
\ No newline at end of file
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
diff --git a/Data/User/GameConfig/GEZE8P.ini b/Data/User/GameConfig/GEZE8P.ini
index 4cb966df2f..2c9afa3700 100644
--- a/Data/User/GameConfig/GEZE8P.ini
+++ b/Data/User/GameConfig/GEZE8P.ini
@@ -12,3 +12,10 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Enhancements]
+PostProcessingShader = 
+[Video_Hacks]
diff --git a/Data/User/GameConfig/GEZP8P.ini b/Data/User/GameConfig/GEZP8P.ini
index 06873a6fb4..ceb07208e7 100644
--- a/Data/User/GameConfig/GEZP8P.ini
+++ b/Data/User/GameConfig/GEZP8P.ini
@@ -12,3 +12,10 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Enhancements]
+PostProcessingShader = 
+[Video_Hacks]
diff --git a/Data/User/GameConfig/GF5E69.ini b/Data/User/GameConfig/GF5E69.ini
index 5a6618b055..40e4375018 100644
--- a/Data/User/GameConfig/GF5E69.ini
+++ b/Data/User/GameConfig/GF5E69.ini
@@ -9,3 +9,5 @@ EmulationStateId = 3
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+[Gecko]
+
diff --git a/Data/User/GameConfig/GF6E69.ini b/Data/User/GameConfig/GF6E69.ini
index d806dc14de..037aeb7404 100644
--- a/Data/User/GameConfig/GF6E69.ini
+++ b/Data/User/GameConfig/GF6E69.ini
@@ -8,3 +8,5 @@ EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow du
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+[Gecko]
+
diff --git a/Data/User/GameConfig/GF6F69.ini b/Data/User/GameConfig/GF6F69.ini
index 381db6a0ef..19bc8b9072 100644
--- a/Data/User/GameConfig/GF6F69.ini
+++ b/Data/User/GameConfig/GF6F69.ini
@@ -7,4 +7,5 @@ EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow du
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-ProjectionHack = 0
\ No newline at end of file
+ProjectionHack = 0
+[Gecko]
diff --git a/Data/User/GameConfig/GF7E01.ini b/Data/User/GameConfig/GF7E01.ini
index c52f864d16..caa783726c 100644
--- a/Data/User/GameConfig/GF7E01.ini
+++ b/Data/User/GameConfig/GF7E01.ini
@@ -78,6 +78,8 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/GF7P01.ini b/Data/User/GameConfig/GF7P01.ini
index 8c458621c6..56a1d6ff09 100644
--- a/Data/User/GameConfig/GF7P01.ini
+++ b/Data/User/GameConfig/GF7P01.ini
@@ -75,6 +75,8 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/GFYE69.ini b/Data/User/GameConfig/GFYE69.ini
index f8c2beb920..8289b3d2ac 100644
--- a/Data/User/GameConfig/GFYE69.ini
+++ b/Data/User/GameConfig/GFYE69.ini
@@ -36,4 +36,7 @@ $Away Team Low Trick Points
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GFYP69.ini b/Data/User/GameConfig/GFYP69.ini
index 1798bc843b..74f910c9e1 100644
--- a/Data/User/GameConfig/GFYP69.ini
+++ b/Data/User/GameConfig/GFYP69.ini
@@ -10,3 +10,5 @@ EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow du
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/User/GameConfig/GFZE01.ini
index 80ff6dbc96..76ffc168b4 100644
--- a/Data/User/GameConfig/GFZE01.ini
+++ b/Data/User/GameConfig/GFZE01.ini
@@ -2,10 +2,9 @@
 [Core] Values set here will override the main dolphin settings.
 EnableFPRF = True
 TLBHack = 1
-CPUThread = 0
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Dual core is unstable.(r7687)
+EmulationIssues = Use direct 3d 9 plugin otherwise disable dual core. Needs to boot a couple of times at the beginning to run with direct 3d 9 plugin in dual core.(r7446)
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
 ProjectionHack = 1
@@ -42,3 +41,8 @@ $All Vehicles Unlocked
 420030C8 0003FFFF
 840030C8 FFDC6F00
 [Gecko]
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+EFBCopyCacheEnable = True
+[Video_Settings]
diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/User/GameConfig/GFZP01.ini
index 47f3aa0909..0c9e96aafe 100644
--- a/Data/User/GameConfig/GFZP01.ini
+++ b/Data/User/GameConfig/GFZP01.ini
@@ -2,10 +2,9 @@
 [Core] Values set here will override the main dolphin settings.
 EnableFPRF = True
 TLBHack = 1
-CPUThread = 0
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Dual core is unstable.(r7687)
+EmulationIssues = Use direct 3d 9 plugin otherwise disable dual core. Needs to boot a couple of times at the beginning to run with direct 3d 9 plugin in dual core.(r7446)
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
 ProjectionHack = 1
@@ -23,3 +22,8 @@ $Make Save Copyable
 04C31108 38000000
 04C3110C 4B400410
 [Gecko]
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
+EFBCopyCacheEnable = True
+[Video_Settings]
diff --git a/Data/User/GameConfig/GGSEA4.ini b/Data/User/GameConfig/GGSEA4.ini
index f6f8a1ea81..2b360866c4 100644
--- a/Data/User/GameConfig/GGSEA4.ini
+++ b/Data/User/GameConfig/GGSEA4.ini
@@ -15,4 +15,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GGSJA4.ini b/Data/User/GameConfig/GGSJA4.ini
index e3fed0b08e..6b2af534ed 100644
--- a/Data/User/GameConfig/GGSJA4.ini
+++ b/Data/User/GameConfig/GGSJA4.ini
@@ -10,3 +10,5 @@ EmulationIssues =
 [ActionReplay]
 [Video]
 ProjectionHack = 0
+[Video_Settings]
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GGSPA4.ini b/Data/User/GameConfig/GGSPA4.ini
index 7a85c1c966..30375b69c0 100644
--- a/Data/User/GameConfig/GGSPA4.ini
+++ b/Data/User/GameConfig/GGSPA4.ini
@@ -8,111 +8,7 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$Infinite Health
-425577DC 02D90064
-6C5577DC 81000000
-425577DC 015C0064
-425577DC 02310064
-$Infinite Oxygen
-025666B6 00000DAC
-$No Reload
-325B08F6 0000000F
-025B08FA 00000019
-2A5B08F6 00000010
-025B08FA 0000000F
-$Max Grip Level
-025666E8 0000012C
-$Have Infinite Rations
-025668FA 00000005
-$Have Infinite Medicine
-025668FE 00000001
-$Have Infinite Bandages
-02566900 0000000A
-$Have Infinite Pentazem
-02566902 0000000A
-$Have Body Armor
-02566906 00000001
-$Have Mine Detector
-0256690A 00000001
-$Have RP Sensor
-0256692A 00000001
-$Have Gas Mask
-0256690E 00000001
-$Have Night Vision Goggles
-02566910 00000001
-$Have Thermal Goggles
-02566912 00000001
-$Have Scope
-02566914 00000001
-$Have Digital Camera
-02566916 00000001
-$Have Rope
-02566920 00000001
-$Have Handkerchief
-0256694A 00000001
-$Have Box 1
-02566918 00000001
-$Have Box 2
-02566924 00000001
-$Have Box 3
-02566926 00000001
-$Have Ketchup
-02566928 00000001
-$Have SOCOM Suppressor
-02566932 00000001
-$Have MO Disc
-0256693C 00000001
-$Have Level 99 Keycard
-0256691C 00000063
-$Have Bandana
-02566938 00000001
-$Have Stealth Suit
-02566908 00000001
-$Have M9 (Infinite Ammo)
-0256686A 0000002E
-$Have SOCOM (Infinite Ammo)
-0256686E 0000003D
-$Have PSG1 (Infinite Ammo)
-02566870 0000003D
-$Have Nikita (Infinite Ammo)
-02566874 00000028
-$Have Stinger (Infinite Ammo)
-02566876 00000028
-$Have Claymore (Infinite Ammo)
-02566878 00000010
-$Have C4 (Infinite Ammo)
-0256687A 00000010
-$Have Chaff Grenade (Infinite Ammo)
-0256687C 00000014
-$Have Stun Grenade (Infinite Ammo)
-0256687E 00000014
-$Have Grenade (Infinite Ammo)
-0256688A 00000014
-$Have FAMAS (Infinite Ammo)
-0256688C 000000D3
-$Have PSG1-T (Infinite Ammo)
-0256688E 0000003D
-$Have Book (Infinite Ammo)
-02566892 00000005
-$Have Magazine (Infinite Ammo)
-02566888 00000064
-$Have No PAL Key
-0256694C 00000000
-$Have Warm (Yellow) PAL Key
-0256694C 00000001
-$Have Cold (Blue) PAL Key
-0256694C 00000002
-$Have Hot (Red) PAL Key
-0256694C 00000003
-$Low Total Game Time
-045666F4 000000A0
-$Saved 0 Times
-025666F2 00000000
-$Continued 0 Times
-025666EC 00000000
-$999 Kills
-02566700 000003E7
-$0 Rations Used
-02567B4C 00000000
 [Video]
 ProjectionHack = 0
+[Video_Settings]
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GGYE41.ini b/Data/User/GameConfig/GGYE41.ini
index de572f1c63..50fe9ee3e0 100644
--- a/Data/User/GameConfig/GGYE41.ini
+++ b/Data/User/GameConfig/GGYE41.ini
@@ -18,4 +18,6 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GGYP41.ini b/Data/User/GameConfig/GGYP41.ini
index f420dadf1e..fbad8671ce 100644
--- a/Data/User/GameConfig/GGYP41.ini
+++ b/Data/User/GameConfig/GGYP41.ini
@@ -18,5 +18,5 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
+SafeTextureCache = True
 
diff --git a/Data/User/GameConfig/GGZE52.ini b/Data/User/GameConfig/GGZE52.ini
index 7f17119e02..c7860326d9 100644
--- a/Data/User/GameConfig/GGZE52.ini
+++ b/Data/User/GameConfig/GGZE52.ini
@@ -1,21 +1,8 @@
 # GGZE52 - Madagascar
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
-FastDiscSpeed = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Alot of GFX glitches (black rastering)
-EmulationStateId = 3
+EmulationStateId = 2
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-[Video_Hacks]
-EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GGZX52.ini b/Data/User/GameConfig/GGZX52.ini
deleted file mode 100644
index a5b8474e79..0000000000
--- a/Data/User/GameConfig/GGZX52.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-# GGZX52 - Madagascar
-[Core] Values set here will override the main dolphin settings.
-TLBHack = 1
-FastDiscSpeed = 1
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Alot of GFX glitches (black rastering)
-EmulationStateId = 3
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video_Hacks]
-EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
\ No newline at end of file
diff --git a/Data/User/GameConfig/GHBE7D.ini b/Data/User/GameConfig/GHBE7D.ini
deleted file mode 100644
index 9f9f8e629a..0000000000
--- a/Data/User/GameConfig/GHBE7D.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GHBE7D - The Hobbit
-[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 = 
-[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 = 
-[Gecko]
diff --git a/Data/User/GameConfig/GHBP7D.ini b/Data/User/GameConfig/GHBP7D.ini
deleted file mode 100644
index 1ae90f225f..0000000000
--- a/Data/User/GameConfig/GHBP7D.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GHBP7D - The Hobbit
-[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 = 
-[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 = 
-[Gecko]
diff --git a/Data/User/GameConfig/GIKE70.ini b/Data/User/GameConfig/GIKE70.ini
index c1f8b8e54f..e3254eb0af 100644
--- a/Data/User/GameConfig/GIKE70.ini
+++ b/Data/User/GameConfig/GIKE70.ini
@@ -5,4 +5,5 @@ EmulationStateId = 5
 [OnFrame]
 [ActionReplay]
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GIKP70.ini b/Data/User/GameConfig/GIKP70.ini
index 64db20f18e..264ea3055d 100644
--- a/Data/User/GameConfig/GIKP70.ini
+++ b/Data/User/GameConfig/GIKP70.ini
@@ -5,4 +5,5 @@ EmulationStateId = 5
 [OnFrame]
 [ActionReplay]
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GILE51.ini b/Data/User/GameConfig/GILE51.ini
index 97f52f64f9..a68e2e48dc 100644
--- a/Data/User/GameConfig/GILE51.ini
+++ b/Data/User/GameConfig/GILE51.ini
@@ -1,4 +1,7 @@
 # GILE51 - Aggressive Inline
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/GILP51.ini b/Data/User/GameConfig/GILP51.ini
index 9fd90640ba..d87a00d5b7 100644
--- a/Data/User/GameConfig/GILP51.ini
+++ b/Data/User/GameConfig/GILP51.ini
@@ -1,4 +1,7 @@
 # GILP51 - Aggressive Inline
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/GJ3PA4.ini b/Data/User/GameConfig/GJ3PA4.ini
index b0be706bb9..02c0919f46 100644
--- a/Data/User/GameConfig/GJ3PA4.ini
+++ b/Data/User/GameConfig/GJ3PA4.ini
@@ -2,7 +2,7 @@
 [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 = Need a Projection Hack Bloom
+EmulationIssues = Need a Projection Hack Bloom and Safe Texture cache
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
 ProjectionHack = 1
@@ -12,3 +12,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [ActionReplay] Add action replay cheats here.
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GJXE51.ini b/Data/User/GameConfig/GJXE51.ini
index 99cab04f30..07db84890e 100644
--- a/Data/User/GameConfig/GJXE51.ini
+++ b/Data/User/GameConfig/GJXE51.ini
@@ -12,6 +12,9 @@ EmulationIssues = Slow,needs mmu and lle audio plugin for proper audio(r7411).
 [OnFrame]
 [ActionReplay]
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 FastDiscSpeed = 1
diff --git a/Data/User/GameConfig/GK5E78.ini b/Data/User/GameConfig/GK5E78.ini
index 51166031b8..bb27d40b41 100644
--- a/Data/User/GameConfig/GK5E78.ini
+++ b/Data/User/GameConfig/GK5E78.ini
@@ -9,4 +9,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GKLE69.ini b/Data/User/GameConfig/GKLE69.ini
index 79f569b430..760bc023a3 100644
--- a/Data/User/GameConfig/GKLE69.ini
+++ b/Data/User/GameConfig/GKLE69.ini
@@ -9,4 +9,5 @@ EmulationIssues = Needs MMU, and is very slow because of it (r6572)
 [Video]
 ProjectionHack = 0
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GKLF69.ini b/Data/User/GameConfig/GKLF69.ini
index f4a9acc88b..f7e2ef20f2 100644
--- a/Data/User/GameConfig/GKLF69.ini
+++ b/Data/User/GameConfig/GKLF69.ini
@@ -9,4 +9,5 @@ EmulationIssues = Needs MMU, and is very slow because of it (r6572)
 [Video]
 ProjectionHack = 0
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GKLP69.ini b/Data/User/GameConfig/GKLP69.ini
index f03cdbfba2..4c7302bfa3 100644
--- a/Data/User/GameConfig/GKLP69.ini
+++ b/Data/User/GameConfig/GKLP69.ini
@@ -14,4 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GKLS69.ini b/Data/User/GameConfig/GKLS69.ini
index 871afd3f1f..f34abbae8a 100644
--- a/Data/User/GameConfig/GKLS69.ini
+++ b/Data/User/GameConfig/GKLS69.ini
@@ -9,4 +9,5 @@ EmulationIssues = Needs MMU, and is very slow because of it (r6572)
 [Video]
 ProjectionHack = 0
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GKME41.ini b/Data/User/GameConfig/GKME41.ini
index dcb62875a9..4f738d5674 100644
--- a/Data/User/GameConfig/GKME41.ini
+++ b/Data/User/GameConfig/GKME41.ini
@@ -9,5 +9,8 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/GKOE70.ini b/Data/User/GameConfig/GKOE70.ini
index eaf5845468..cc267dd4dd 100644
--- a/Data/User/GameConfig/GKOE70.ini
+++ b/Data/User/GameConfig/GKOE70.ini
@@ -9,4 +9,6 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GKOP70.ini b/Data/User/GameConfig/GKOP70.ini
index 1058fa8d0c..239477ef97 100644
--- a/Data/User/GameConfig/GKOP70.ini
+++ b/Data/User/GameConfig/GKOP70.ini
@@ -9,4 +9,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GKUE9G.ini b/Data/User/GameConfig/GKUE9G.ini
index abdf02d167..4fce1959df 100644
--- a/Data/User/GameConfig/GKUE9G.ini
+++ b/Data/User/GameConfig/GKUE9G.ini
@@ -14,4 +14,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GLCE52.ini b/Data/User/GameConfig/GLCE52.ini
index 9a324fdef5..2d296b4cc3 100644
--- a/Data/User/GameConfig/GLCE52.ini
+++ b/Data/User/GameConfig/GLCE52.ini
@@ -17,6 +17,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
 DstAlphaPass = True
 [Video_Hacks]
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/GM5E7D.ini b/Data/User/GameConfig/GM5E7D.ini
index 1e67b1035e..f7aa5f8eee 100644
--- a/Data/User/GameConfig/GM5E7D.ini
+++ b/Data/User/GameConfig/GM5E7D.ini
@@ -1,4 +1,7 @@
 # GM5E7D - Metal Arms: Glitch in the System
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 CPUThread = 0
 [Video]
diff --git a/Data/User/GameConfig/GM5F7D.ini b/Data/User/GameConfig/GM5F7D.ini
index 4d24520ad7..4c8b28f81e 100644
--- a/Data/User/GameConfig/GM5F7D.ini
+++ b/Data/User/GameConfig/GM5F7D.ini
@@ -1,4 +1,7 @@
 # GM5F7D - Metal Arms: Glitch in the System
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 CPUThread = 0
 [Video]
diff --git a/Data/User/GameConfig/GM5P7D.ini b/Data/User/GameConfig/GM5P7D.ini
index a3f1f84e8d..3d61a5be29 100644
--- a/Data/User/GameConfig/GM5P7D.ini
+++ b/Data/User/GameConfig/GM5P7D.ini
@@ -1,4 +1,7 @@
 # GM5P7D - Metal Arms: Glitch in the System
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Core]
 CPUThread = 0
 [Video]
diff --git a/Data/User/GameConfig/GM6EE9.ini b/Data/User/GameConfig/GM6EE9.ini
index 3a383e92e8..37fa68e57c 100644
--- a/Data/User/GameConfig/GM6EE9.ini
+++ b/Data/User/GameConfig/GM6EE9.ini
@@ -13,4 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GM6PE9.ini b/Data/User/GameConfig/GM6PE9.ini
index 1efffc3d37..2a8664ebbb 100644
--- a/Data/User/GameConfig/GM6PE9.ini
+++ b/Data/User/GameConfig/GM6PE9.ini
@@ -13,3 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GM8E01.ini b/Data/User/GameConfig/GM8E01.ini
index fe41397760..f706caab46 100644
--- a/Data/User/GameConfig/GM8E01.ini
+++ b/Data/User/GameConfig/GM8E01.ini
@@ -94,7 +94,11 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+EFBToTextureEnable = False
+[Video_Enhancements]
+PostProcessingShader = 
diff --git a/Data/User/GameConfig/GM8J01.ini b/Data/User/GameConfig/GM8J01.ini
index e0f99b1634..7f6944b210 100644
--- a/Data/User/GameConfig/GM8J01.ini
+++ b/Data/User/GameConfig/GM8J01.ini
@@ -1,4 +1,4 @@
-# GM8J01 - Metroid Prime
+# GM8E01 - Metroid Prime
 [Core]
 #Values set here will override the main dolphin settings.
 [Speedhacks]
@@ -18,7 +18,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
\ No newline at end of file
+EFBToTextureEnable = False
diff --git a/Data/User/GameConfig/GM8P01.ini b/Data/User/GameConfig/GM8P01.ini
index 7a027fe3d7..a1dcbc1d45 100644
--- a/Data/User/GameConfig/GM8P01.ini
+++ b/Data/User/GameConfig/GM8P01.ini
@@ -7,7 +7,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = needs safe texture cache
 [EmuState]
 EmulationStateId = 0
 [OnFrame]
@@ -20,8 +20,10 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+EFBToTextureEnable = False
 
diff --git a/Data/User/GameConfig/GMSE01.ini b/Data/User/GameConfig/GMSE01.ini
index cb1ce030c7..2aadc5ce80 100644
--- a/Data/User/GameConfig/GMSE01.ini
+++ b/Data/User/GameConfig/GMSE01.ini
@@ -142,9 +142,8 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
 [Video_Settings]
 wideScreenHack = False
 UseNativeMips = True
diff --git a/Data/User/GameConfig/GMSJ01.ini b/Data/User/GameConfig/GMSJ01.ini
deleted file mode 100644
index 18ef10ccdf..0000000000
--- a/Data/User/GameConfig/GMSJ01.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-# GMSJ01 - Super Mario Sunshine
-[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
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay]
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Video_Hacks]
-EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-[Video_Settings]
-wideScreenHack = False
-UseNativeMips = True
-AspectRatio = 0
diff --git a/Data/User/GameConfig/GMSP01.ini b/Data/User/GameConfig/GMSP01.ini
index a0a0cd2052..d104e0f26a 100644
--- a/Data/User/GameConfig/GMSP01.ini
+++ b/Data/User/GameConfig/GMSP01.ini
@@ -27,13 +27,13 @@ $8 Red coins (Press L+B)
 025709DE 00000008
 $Open Levels/Nozzles
 00E60AE0 18000000
-04570958 18000000
-0457095C 18000000
+04570958 FFFFFFFF
+0457095C FFFFFFFF
 $All Shines
 00E60AE1 18000000
-045708E8 18000000
-045708EC 18000000
-045708F0 18000000
+045708E8 FFFFFFFF
+045708EC FFFFFFFF
+045708F0 FFFFFFFF
 $Low Gravity
 00E60AE2 18000000
 424057F4 05003E00
@@ -67,10 +67,10 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
 [Video_Settings]
 wideScreenHack = False
 UseNativeMips = True
 AspectRatio = 0
+
diff --git a/Data/User/GameConfig/GN6E69.ini b/Data/User/GameConfig/GN6E69.ini
deleted file mode 100644
index 1e3fd16edf..0000000000
--- a/Data/User/GameConfig/GN6E69.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# GN6E69 - NHL06
-[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 = 
-[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 = 
-[Gecko]
diff --git a/Data/User/GameConfig/GNNE69.ini b/Data/User/GameConfig/GNNE69.ini
index 64c9f47f14..e089c40997 100644
--- a/Data/User/GameConfig/GNNE69.ini
+++ b/Data/User/GameConfig/GNNE69.ini
@@ -8,3 +8,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GNOE78.ini b/Data/User/GameConfig/GNOE78.ini
index b763445491..cd8c06fa53 100644
--- a/Data/User/GameConfig/GNOE78.ini
+++ b/Data/User/GameConfig/GNOE78.ini
@@ -15,4 +15,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.000153
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GOYD69.ini b/Data/User/GameConfig/GOYD69.ini
index 553dc1f834..0a8955ef74 100644
--- a/Data/User/GameConfig/GOYD69.ini
+++ b/Data/User/GameConfig/GOYD69.ini
@@ -6,6 +6,9 @@ EmulationIssues = Videos are messed up. Use LLE for proper sound.(r7446)
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/GOYE69.ini b/Data/User/GameConfig/GOYE69.ini
index a5f8dc919e..0643b0faa5 100644
--- a/Data/User/GameConfig/GOYE69.ini
+++ b/Data/User/GameConfig/GOYE69.ini
@@ -35,6 +35,9 @@ $Slow Enemies (Use On A Empty Profile)
 044F7FFC 3D000000
 $Disable Shadows (Use On A Empty Profile)
 044FA2A4 00000001
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/GPHE52.ini b/Data/User/GameConfig/GPHE52.ini
index 54dcb325e7..3047d82bc4 100644
--- a/Data/User/GameConfig/GPHE52.ini
+++ b/Data/User/GameConfig/GPHE52.ini
@@ -9,5 +9,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GPOE8P.ini b/Data/User/GameConfig/GPOE8P.ini
index aa9c9c883d..7b94b09ec5 100644
--- a/Data/User/GameConfig/GPOE8P.ini
+++ b/Data/User/GameConfig/GPOE8P.ini
@@ -44,3 +44,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GPOP8P.ini b/Data/User/GameConfig/GPOP8P.ini
index 9aec854486..c6fe1f33e1 100644
--- a/Data/User/GameConfig/GPOP8P.ini
+++ b/Data/User/GameConfig/GPOP8P.ini
@@ -2,7 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = needs texture cache
 [OnFrame]
 [ActionReplay]
 $ENABLE
@@ -61,4 +61,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+[Video_Settings]
+SafeTextureCache = True
 [Gecko]
diff --git a/Data/User/GameConfig/GPSP8P.ini b/Data/User/GameConfig/GPSP8P.ini
index 7563f068e0..787743cc82 100644
--- a/Data/User/GameConfig/GPSP8P.ini
+++ b/Data/User/GameConfig/GPSP8P.ini
@@ -2,7 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 2
-EmulationIssues = 
+EmulationIssues = needs texture cache
 [Speedhacks]
 # Patch OSYieldThread in attempt to make a speedhack (gave me a few fps more :) )
 0x8036eba0=400
@@ -60,4 +60,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
+[Video_Settings]
+SafeTextureCache = True
 [Gecko]
diff --git a/Data/User/GameConfig/GQSDAF.ini b/Data/User/GameConfig/GQSDAF.ini
index 4f38f0c417..b2ca3063f2 100644
--- a/Data/User/GameConfig/GQSDAF.ini
+++ b/Data/User/GameConfig/GQSDAF.ini
@@ -16,3 +16,5 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/User/GameConfig/GQSEAF.ini
index 44111ea158..c190a0f463 100644
--- a/Data/User/GameConfig/GQSEAF.ini
+++ b/Data/User/GameConfig/GQSEAF.ini
@@ -786,5 +786,8 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/User/GameConfig/GQSFAF.ini
index 83fd5bed07..901cba8f92 100644
--- a/Data/User/GameConfig/GQSFAF.ini
+++ b/Data/User/GameConfig/GQSFAF.ini
@@ -16,3 +16,5 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/User/GameConfig/GQSPAF.ini
index dc12c2d671..df727db8b2 100644
--- a/Data/User/GameConfig/GQSPAF.ini
+++ b/Data/User/GameConfig/GQSPAF.ini
@@ -16,3 +16,5 @@ PH_ExtraParam = 0
 PH_ZNear = 0.5
 PH_ZFar = 1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GRKE41.ini b/Data/User/GameConfig/GRKE41.ini
index 990258a873..fd75690f3b 100644
--- a/Data/User/GameConfig/GRKE41.ini
+++ b/Data/User/GameConfig/GRKE41.ini
@@ -15,5 +15,7 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
+SafeTextureCache = True
 UseRealXFB = False
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GRKP7G.ini b/Data/User/GameConfig/GRKP7G.ini
index 3382e405bf..49a5f1d6cc 100644
--- a/Data/User/GameConfig/GRKP7G.ini
+++ b/Data/User/GameConfig/GRKP7G.ini
@@ -15,3 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
+SafeTextureCache = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/GRSPAF.ini b/Data/User/GameConfig/GRSPAF.ini
index 2fabd40ae6..214f087b16 100644
--- a/Data/User/GameConfig/GRSPAF.ini
+++ b/Data/User/GameConfig/GRSPAF.ini
@@ -557,4 +557,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
+SafeTextureCache = True
 
diff --git a/Data/User/GameConfig/GT6E70.ini b/Data/User/GameConfig/GT6E70.ini
index 5f0e6a88f4..0ac6253eb4 100644
--- a/Data/User/GameConfig/GT6E70.ini
+++ b/Data/User/GameConfig/GT6E70.ini
@@ -52,4 +52,6 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False
 EFBAccessEnable = False
diff --git a/Data/User/GameConfig/GT7E41.ini b/Data/User/GameConfig/GT7E41.ini
index 0fe4bd8515..99426db64a 100644
--- a/Data/User/GameConfig/GT7E41.ini
+++ b/Data/User/GameConfig/GT7E41.ini
@@ -17,4 +17,6 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GT7P41.ini b/Data/User/GameConfig/GT7P41.ini
index da46609de2..13cb3250bc 100644
--- a/Data/User/GameConfig/GT7P41.ini
+++ b/Data/User/GameConfig/GT7P41.ini
@@ -16,4 +16,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
\ No newline at end of file
+UseRealXFB = True
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GT7X41.ini b/Data/User/GameConfig/GT7X41.ini
index b9460865cc..e8144424d3 100644
--- a/Data/User/GameConfig/GT7X41.ini
+++ b/Data/User/GameConfig/GT7X41.ini
@@ -16,4 +16,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
\ No newline at end of file
+UseRealXFB = True
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GTEE01.ini b/Data/User/GameConfig/GTEE01.ini
index d9746e96e4..ca07a84656 100644
--- a/Data/User/GameConfig/GTEE01.ini
+++ b/Data/User/GameConfig/GTEE01.ini
@@ -39,7 +39,7 @@ $Huge Score
 0427293C 000F423F
 $Everything Unlocked
 0426DEB8 0004FFFF
-0426DEBC 0004FFFF
+0426DEBC FFFFFFFF
 $All Gate Challenges Complete
 0226DEC8 0003FFFF
 $All Time Trials Complete
@@ -49,11 +49,5 @@ $Moon Jump (Press Z)
 042723E4 43000000
 [Video]
 ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
 [Gecko]
-[Video_Hacks]
-DlistCachingEnable = False
+
diff --git a/Data/User/GameConfig/GTEP01.ini b/Data/User/GameConfig/GTEP01.ini
index 31bf519769..a998043441 100644
--- a/Data/User/GameConfig/GTEP01.ini
+++ b/Data/User/GameConfig/GTEP01.ini
@@ -22,5 +22,3 @@ XCV7-0RNZ-8ZPV6
 $Time Trial: Found 5 Coin Pieces 
 GZ5T-HADH-NGPBM
 BAF8-QT5K-5N9WC
-[Video_Hacks]
-DlistCachingEnable = False
diff --git a/Data/User/GameConfig/GTKP51.ini b/Data/User/GameConfig/GTKP51.ini
index f7929de832..a3bf07df79 100644
--- a/Data/User/GameConfig/GTKP51.ini
+++ b/Data/User/GameConfig/GTKP51.ini
@@ -14,4 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
diff --git a/Data/User/GameConfig/GWWP01.ini b/Data/User/GameConfig/GWWP01.ini
index fb9c11b925..2dc578d4bd 100644
--- a/Data/User/GameConfig/GWWP01.ini
+++ b/Data/User/GameConfig/GWWP01.ini
@@ -5,42 +5,3 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Infinite/max health
-04114244 3800000E
-$Lots of coins
-04030764 38007FFF
-$All levels open
-041D8BEC FFFFFFFF
-$Moon Jump (Hold A)
-04111B74 3D803E00
-04111B78 618C01CE
-0A439104 00000100
-04111B7C 919E0208
-0A439104 00000000
-04111B7C 60000000
-$All levels open and complete  GBA games
-041D8BEC FFFFFFFF
-041D8BF4 FFFFFFFF
-041D8BF8 FFFFFFFF
-021D8BFC 0000FFFF
-041D8C04 FFFFFFFF
-041D8C08 FFFFFFFF
-021D8C0C 0000FFFF
-041D8C24 FFFFFFFF
-041D8C28 FFFFFFFF
-021D8C2C 0000FFFF
-041D8C34 FFFFFFFF
-041D8C38 FFFFFFFF
-021D8C3C 0000FFFF
-041D8C54 FFFFFFFF
-041D8C58 FFFFFFFF
-021D8C5C 0000FFFF
-041D8C64 FFFFFFFF
-041D8C68 FFFFFFFF
-021D8C6C 0000FFFF
-041D8C84 FFFFFFFF
-041D8C88 FFFFFFFF
-021D8C8C 0000FFFF
-041D8C94 FFFFFFFF
-041D8C98 FFFFFFFF
-021D8C9C 0000FFFF
\ No newline at end of file
diff --git a/Data/User/GameConfig/GWYE41.ini b/Data/User/GameConfig/GWYE41.ini
index 8b9e221709..9aa12b7bd6 100644
--- a/Data/User/GameConfig/GWYE41.ini
+++ b/Data/User/GameConfig/GWYE41.ini
@@ -17,3 +17,4 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/GXNE5D.ini b/Data/User/GameConfig/GXNE5D.ini
index 9feb8de37a..a23df80156 100644
--- a/Data/User/GameConfig/GXNE5D.ini
+++ b/Data/User/GameConfig/GXNE5D.ini
@@ -9,4 +9,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/GXXE01.ini b/Data/User/GameConfig/GXXE01.ini
index 1d471b86e0..a66e71accf 100644
--- a/Data/User/GameConfig/GXXE01.ini
+++ b/Data/User/GameConfig/GXXE01.ini
@@ -17,3 +17,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GXXP01.ini b/Data/User/GameConfig/GXXP01.ini
index 70565475eb..9d2a0435d5 100644
--- a/Data/User/GameConfig/GXXP01.ini
+++ b/Data/User/GameConfig/GXXP01.ini
@@ -17,3 +17,6 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 EFBScale = 1
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
+
diff --git a/Data/User/GameConfig/GZ2E01.ini b/Data/User/GameConfig/GZ2E01.ini
index bc9a0793b7..760ac4368b 100644
--- a/Data/User/GameConfig/GZ2E01.ini
+++ b/Data/User/GameConfig/GZ2E01.ini
@@ -1485,3 +1485,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Video_Settings]
+SafeTextureCache = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GZ2J01.ini b/Data/User/GameConfig/GZ2J01.ini
index f5c17670b4..5ae8e69bfa 100644
--- a/Data/User/GameConfig/GZ2J01.ini
+++ b/Data/User/GameConfig/GZ2J01.ini
@@ -18,3 +18,11 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Video_Settings]
+SafeTextureCache = False
+SafeTextureCacheColorSamples = 512
+[Video_Enhancements]
+PostProcessingShader = 
\ No newline at end of file
diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/User/GameConfig/GZ2P01.ini
index 57cf3b169c..9252b294c7 100644
--- a/Data/User/GameConfig/GZ2P01.ini
+++ b/Data/User/GameConfig/GZ2P01.ini
@@ -85,4 +85,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Video_Settings]
+SafeTextureCache = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GZEE70.ini b/Data/User/GameConfig/GZEE70.ini
index 176287df84..837b4c2f29 100644
--- a/Data/User/GameConfig/GZEE70.ini
+++ b/Data/User/GameConfig/GZEE70.ini
@@ -7,6 +7,9 @@ Issues="Playable,but sometimes slowdown FPS maybe is patched"
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/GZLE01.ini b/Data/User/GameConfig/GZLE01.ini
index 7c4cfe69f9..adf073b2ce 100644
--- a/Data/User/GameConfig/GZLE01.ini
+++ b/Data/User/GameConfig/GZLE01.ini
@@ -357,6 +357,6 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 EFBAccessEnable = True
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+
diff --git a/Data/User/GameConfig/GZLJ01.ini b/Data/User/GameConfig/GZLJ01.ini
index ab0c22a2d2..27168b24f5 100644
--- a/Data/User/GameConfig/GZLJ01.ini
+++ b/Data/User/GameConfig/GZLJ01.ini
@@ -31,6 +31,6 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 EFBAccessEnable = True
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+
diff --git a/Data/User/GameConfig/GZLP01.ini b/Data/User/GameConfig/GZLP01.ini
index 30d32dea5d..1b502564f7 100644
--- a/Data/User/GameConfig/GZLP01.ini
+++ b/Data/User/GameConfig/GZLP01.ini
@@ -236,6 +236,5 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 EFBAccessEnable = True
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
diff --git a/Data/User/GameConfig/GZWE01.ini b/Data/User/GameConfig/GZWE01.ini
index c2b727f34e..ad6eda6c35 100644
--- a/Data/User/GameConfig/GZWE01.ini
+++ b/Data/User/GameConfig/GZWE01.ini
@@ -5,6 +5,9 @@ EmulationStateId = 3
 EmulationIssues = Need Save texture cache,graphic glitches
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video_Hacks]
 [Video]
diff --git a/Data/User/GameConfig/HACA01.ini b/Data/User/GameConfig/HACA01.ini
index cb7a4b7f3c..d3a9f197b8 100644
--- a/Data/User/GameConfig/HACA01.ini
+++ b/Data/User/GameConfig/HACA01.ini
@@ -7,3 +7,5 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/R3NEXS.ini b/Data/User/GameConfig/R3NEXS.ini
index 90da0ce799..a4cd53830f 100644
--- a/Data/User/GameConfig/R3NEXS.ini
+++ b/Data/User/GameConfig/R3NEXS.ini
@@ -8,4 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/R3OE01.ini b/Data/User/GameConfig/R3OE01.ini
index fbd28cb030..308cb3e4eb 100644
--- a/Data/User/GameConfig/R3OE01.ini
+++ b/Data/User/GameConfig/R3OE01.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 1
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/R3OJ01.ini b/Data/User/GameConfig/R3OJ01.ini
index ee1a83d621..2616b66fda 100644
--- a/Data/User/GameConfig/R3OJ01.ini
+++ b/Data/User/GameConfig/R3OJ01.ini
@@ -13,3 +13,5 @@ PH_ExtraParam = 1
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/R3OP01.ini b/Data/User/GameConfig/R3OP01.ini
index cab59460ee..11284c5749 100644
--- a/Data/User/GameConfig/R3OP01.ini
+++ b/Data/User/GameConfig/R3OP01.ini
@@ -13,3 +13,5 @@ PH_ExtraParam = 1
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/R5IE4Q.ini b/Data/User/GameConfig/R5IE4Q.ini
index 9d8a4442da..54dd70a5a4 100644
--- a/Data/User/GameConfig/R5IE4Q.ini
+++ b/Data/User/GameConfig/R5IE4Q.ini
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/R5IX4Q.ini b/Data/User/GameConfig/R5IX4Q.ini
index 12bc6febae..2ef502fe6c 100644
--- a/Data/User/GameConfig/R5IX4Q.ini
+++ b/Data/User/GameConfig/R5IX4Q.ini
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/R5WEA4.ini b/Data/User/GameConfig/R5WEA4.ini
index e3c3e41984..c00ce1cfe4 100644
--- a/Data/User/GameConfig/R5WEA4.ini
+++ b/Data/User/GameConfig/R5WEA4.ini
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/User/GameConfig/R5WJA4.ini
index 7c11ac393b..95e8288a51 100644
--- a/Data/User/GameConfig/R5WJA4.ini
+++ b/Data/User/GameConfig/R5WJA4.ini
@@ -7,11 +7,6 @@ EmulationIssues = Flashlight glitches (r6521)
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
\ No newline at end of file
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/R6YPH3.ini b/Data/User/GameConfig/R6YPH3.ini
index ab14abfc76..cc17213f48 100644
--- a/Data/User/GameConfig/R6YPH3.ini
+++ b/Data/User/GameConfig/R6YPH3.ini
@@ -7,4 +7,6 @@ EmulationStateId = 0
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/R7EE8P.ini b/Data/User/GameConfig/R7EE8P.ini
index 98eedfe29b..debcf62f86 100644
--- a/Data/User/GameConfig/R7EE8P.ini
+++ b/Data/User/GameConfig/R7EE8P.ini
@@ -13,4 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/Data/User/GameConfig/R7EJ8P.ini b/Data/User/GameConfig/R7EJ8P.ini
index 95d75be274..ba735e5b0f 100644
--- a/Data/User/GameConfig/R7EJ8P.ini
+++ b/Data/User/GameConfig/R7EJ8P.ini
@@ -14,4 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/Data/User/GameConfig/R7EP8P.ini b/Data/User/GameConfig/R7EP8P.ini
index 9a8147ab04..9f7615756b 100644
--- a/Data/User/GameConfig/R7EP8P.ini
+++ b/Data/User/GameConfig/R7EP8P.ini
@@ -14,4 +14,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.1
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/Data/User/GameConfig/R84EE9.ini b/Data/User/GameConfig/R84EE9.ini
index caa969a4ee..cb3930e4b3 100644
--- a/Data/User/GameConfig/R84EE9.ini
+++ b/Data/User/GameConfig/R84EE9.ini
@@ -1,4 +1,7 @@
 # R84EE9 - Harvest Moon Tree Of Tranquility
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/R84P99.ini b/Data/User/GameConfig/R84P99.ini
index d17fcf8b37..7e578edbde 100644
--- a/Data/User/GameConfig/R84P99.ini
+++ b/Data/User/GameConfig/R84P99.ini
@@ -1,4 +1,7 @@
 # R84P99 - Harvest Moon Tree Of Tranquility
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RBBE18.ini b/Data/User/GameConfig/RBBE18.ini
index 49b955246d..a6983f3157 100644
--- a/Data/User/GameConfig/RBBE18.ini
+++ b/Data/User/GameConfig/RBBE18.ini
@@ -1,6 +1,9 @@
 # RBBE18 - Bomberman Land
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/RBBJ18.ini b/Data/User/GameConfig/RBBJ18.ini
index a1247a2205..b8618a5021 100644
--- a/Data/User/GameConfig/RBBJ18.ini
+++ b/Data/User/GameConfig/RBBJ18.ini
@@ -1,6 +1,9 @@
 # RBBJ18 - Bomberman Land
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/RBBP99.ini b/Data/User/GameConfig/RBBP99.ini
index 27cccb9119..f4254a565e 100644
--- a/Data/User/GameConfig/RBBP99.ini
+++ b/Data/User/GameConfig/RBBP99.ini
@@ -1,6 +1,9 @@
 # RBBP99 - Bomberman Land
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Video]
 ProjectionHack = 0
diff --git a/Data/User/GameConfig/RBHE08.ini b/Data/User/GameConfig/RBHE08.ini
index 1e321df00f..70e107228b 100644
--- a/Data/User/GameConfig/RBHE08.ini
+++ b/Data/User/GameConfig/RBHE08.ini
@@ -16,3 +16,6 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 DlistCachingEnable = False
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/RBHJ08.ini b/Data/User/GameConfig/RBHJ08.ini
index 256076df6e..3d8cc9f715 100644
--- a/Data/User/GameConfig/RBHJ08.ini
+++ b/Data/User/GameConfig/RBHJ08.ini
@@ -17,4 +17,7 @@ PH_ZFar =
 [Video_Hacks]
 DlistCachingEnable = False
 [Video_Enhancements]
-PostProcessingShader = 
\ No newline at end of file
+PostProcessingShader = 
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/RBHP08.ini b/Data/User/GameConfig/RBHP08.ini
index 304de45c4b..b7bd141069 100644
--- a/Data/User/GameConfig/RBHP08.ini
+++ b/Data/User/GameConfig/RBHP08.ini
@@ -16,4 +16,7 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 DlistCachingEnable = False
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/RDBPAF.ini b/Data/User/GameConfig/RDBPAF.ini
index 2f65f24462..9d3ddb23e9 100644
--- a/Data/User/GameConfig/RDBPAF.ini
+++ b/Data/User/GameConfig/RDBPAF.ini
@@ -13,4 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/RDSE70.ini b/Data/User/GameConfig/RDSE70.ini
index 2d515d296d..e3f23aa99c 100644
--- a/Data/User/GameConfig/RDSE70.ini
+++ b/Data/User/GameConfig/RDSE70.ini
@@ -13,3 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/RDSJAF.ini b/Data/User/GameConfig/RDSJAF.ini
index 693b8c5e93..8b208019f3 100644
--- a/Data/User/GameConfig/RDSJAF.ini
+++ b/Data/User/GameConfig/RDSJAF.ini
@@ -8,3 +8,5 @@ EmulationStateId = 5
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RDSPAF.ini b/Data/User/GameConfig/RDSPAF.ini
index 9688ca994f..58cbbb496a 100644
--- a/Data/User/GameConfig/RDSPAF.ini
+++ b/Data/User/GameConfig/RDSPAF.ini
@@ -7,4 +7,6 @@ EmulationStateId = 5
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RFCEGD.ini b/Data/User/GameConfig/RFCEGD.ini
index 32894402c7..23d3a8cbcc 100644
--- a/Data/User/GameConfig/RFCEGD.ini
+++ b/Data/User/GameConfig/RFCEGD.ini
@@ -8,5 +8,8 @@ EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/RFCPGD.ini b/Data/User/GameConfig/RFCPGD.ini
index 3664c76ecc..0a8daa4dbe 100644
--- a/Data/User/GameConfig/RFCPGD.ini
+++ b/Data/User/GameConfig/RFCPGD.ini
@@ -6,4 +6,6 @@ EmulationIssues = Turn off "use panic handlers". Water glitches (r6521)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RFFEGD.ini b/Data/User/GameConfig/RFFEGD.ini
index adbb0b282f..bbe10445f4 100644
--- a/Data/User/GameConfig/RFFEGD.ini
+++ b/Data/User/GameConfig/RFFEGD.ini
@@ -14,4 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
 EFBScale = 2
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/RFFJGD.ini b/Data/User/GameConfig/RFFJGD.ini
index 4d2c593203..749f5e068f 100644
--- a/Data/User/GameConfig/RFFJGD.ini
+++ b/Data/User/GameConfig/RFFJGD.ini
@@ -14,5 +14,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
 EFBScale = 2
 
diff --git a/Data/User/GameConfig/RFFPGD.ini b/Data/User/GameConfig/RFFPGD.ini
index 1eaf97653b..9c24e2df88 100644
--- a/Data/User/GameConfig/RFFPGD.ini
+++ b/Data/User/GameConfig/RFFPGD.ini
@@ -14,4 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
 EFBScale = 2
diff --git a/Data/User/GameConfig/RFQP69.ini b/Data/User/GameConfig/RFQP69.ini
index 27dfd98093..ced45265c7 100644
--- a/Data/User/GameConfig/RFQP69.ini
+++ b/Data/User/GameConfig/RFQP69.ini
@@ -7,3 +7,5 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 Hack = 3
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RHOE8P.ini b/Data/User/GameConfig/RHOE8P.ini
index c28f341fb6..b2d2471bb3 100644
--- a/Data/User/GameConfig/RHOE8P.ini
+++ b/Data/User/GameConfig/RHOE8P.ini
@@ -7,11 +7,6 @@ EmulationIssues = Use dx11 plugin (r6945)
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
 [Gecko]
 $Infinte Bomb Usage after Getting 1 [g6flavor]
 04159D1C 60000000
@@ -35,5 +30,4 @@ $If Score Increase, MAX [ZiT]
 C2152674 00000002
 3CA03B9B 38A5C9FF
 90B60178 00000000
-[Wii]
-DisableWiimoteSpeaker = 1
+
diff --git a/Data/User/GameConfig/RHOJ8P.ini b/Data/User/GameConfig/RHOJ8P.ini
index 3e23f6605c..1710b59cd5 100644
--- a/Data/User/GameConfig/RHOJ8P.ini
+++ b/Data/User/GameConfig/RHOJ8P.ini
@@ -8,5 +8,4 @@ EmulationIssues = Use dx11 plugin (r6945)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+
diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/User/GameConfig/RHOP8P.ini
index e7ee75a97e..f5a3a14229 100644
--- a/Data/User/GameConfig/RHOP8P.ini
+++ b/Data/User/GameConfig/RHOP8P.ini
@@ -8,5 +8,3 @@ EmulationIssues = Use dx11 plugin (r6945)
 [Video]
 ProjectionHack = 0
 [Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
\ No newline at end of file
diff --git a/Data/User/GameConfig/RIPEAF.ini b/Data/User/GameConfig/RIPEAF.ini
index 2c27cc583e..192d024521 100644
--- a/Data/User/GameConfig/RIPEAF.ini
+++ b/Data/User/GameConfig/RIPEAF.ini
@@ -8,5 +8,8 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/RIPJAF.ini b/Data/User/GameConfig/RIPJAF.ini
index cb1ef986a2..8daa461e7c 100644
--- a/Data/User/GameConfig/RIPJAF.ini
+++ b/Data/User/GameConfig/RIPJAF.ini
@@ -8,3 +8,5 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RIPPAF.ini b/Data/User/GameConfig/RIPPAF.ini
index a312e98433..f0756110ea 100644
--- a/Data/User/GameConfig/RIPPAF.ini
+++ b/Data/User/GameConfig/RIPPAF.ini
@@ -8,3 +8,5 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RIUJAF.ini b/Data/User/GameConfig/RIUJAF.ini
index 1ae02f22d6..c5dea403f9 100644
--- a/Data/User/GameConfig/RIUJAF.ini
+++ b/Data/User/GameConfig/RIUJAF.ini
@@ -8,3 +8,5 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RIUPAF.ini b/Data/User/GameConfig/RIUPAF.ini
index 66bfc6854f..2b45e950b1 100644
--- a/Data/User/GameConfig/RIUPAF.ini
+++ b/Data/User/GameConfig/RIUPAF.ini
@@ -8,4 +8,7 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/RK2EEB.ini b/Data/User/GameConfig/RK2EEB.ini
index 90226d557c..7c63634d23 100644
--- a/Data/User/GameConfig/RK2EEB.ini
+++ b/Data/User/GameConfig/RK2EEB.ini
@@ -8,3 +8,6 @@ EmulationStateId = 0
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/RK2JEB.ini b/Data/User/GameConfig/RK2JEB.ini
index 28d2e3d4ba..8016eac272 100644
--- a/Data/User/GameConfig/RK2JEB.ini
+++ b/Data/User/GameConfig/RK2JEB.ini
@@ -8,3 +8,5 @@ EmulationStateId = 0
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RK2P01.ini b/Data/User/GameConfig/RK2P01.ini
index 3b13813b82..9d8895d1d2 100644
--- a/Data/User/GameConfig/RK2P01.ini
+++ b/Data/User/GameConfig/RK2P01.ini
@@ -7,4 +7,6 @@ EmulationStateId = 0
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RKDEEB.ini b/Data/User/GameConfig/RKDEEB.ini
index ca2424bc64..0494409839 100644
--- a/Data/User/GameConfig/RKDEEB.ini
+++ b/Data/User/GameConfig/RKDEEB.ini
@@ -8,4 +8,7 @@ EmulationStateId = 0
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/RKDP01.ini b/Data/User/GameConfig/RKDP01.ini
index 629d9257d1..5e430c75b9 100644
--- a/Data/User/GameConfig/RKDP01.ini
+++ b/Data/User/GameConfig/RKDP01.ini
@@ -6,4 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
+[Video_Settings]
+SafeTextureCache = True
 
diff --git a/Data/User/GameConfig/RKDPEB.ini b/Data/User/GameConfig/RKDPEB.ini
index a3e6db572f..f6c8b3f8a2 100644
--- a/Data/User/GameConfig/RKDPEB.ini
+++ b/Data/User/GameConfig/RKDPEB.ini
@@ -7,4 +7,6 @@ EmulationStateId = 0
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/User/GameConfig/RM3E01.ini
index 1efdc4528f..5ef96b0d77 100644
--- a/Data/User/GameConfig/RM3E01.ini
+++ b/Data/User/GameConfig/RM3E01.ini
@@ -15,7 +15,11 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+[Video_Enhancements]
+PostProcessingShader = 
diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/User/GameConfig/RM3J01.ini
index 40f66ba49d..f27e1e111d 100644
--- a/Data/User/GameConfig/RM3J01.ini
+++ b/Data/User/GameConfig/RM3J01.ini
@@ -15,7 +15,11 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
\ No newline at end of file
+[Video_Enhancements]
+PostProcessingShader = 
diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/User/GameConfig/RM3P01.ini
index dcb7483b39..42dc04ed9d 100644
--- a/Data/User/GameConfig/RM3P01.ini
+++ b/Data/User/GameConfig/RM3P01.ini
@@ -6,7 +6,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = minor coloring problems
 [OnFrame]
 [ActionReplay]
 [Video]
@@ -17,7 +17,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/RNHE41.ini b/Data/User/GameConfig/RNHE41.ini
index 2440cfe174..3bf35d5aed 100644
--- a/Data/User/GameConfig/RNHE41.ini
+++ b/Data/User/GameConfig/RNHE41.ini
@@ -1,21 +1,13 @@
 # RNHE41 - NO MORE HEROES
 [Core] Values set here will override the main dolphin settings.
+SkipIdle = 0
 [Speedhacks]
 0x8035bc9c=700
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Unstable, needs LLE audio for better stability.(r7687)
+EmulationStateId = 2
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
 [Video]
 ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
 [Gecko]
-[Video_Hacks]
-EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
diff --git a/Data/User/GameConfig/RNOJ01.ini b/Data/User/GameConfig/RNOJ01.ini
index e67b33d115..cf8e7b7dd9 100644
--- a/Data/User/GameConfig/RNOJ01.ini
+++ b/Data/User/GameConfig/RNOJ01.ini
@@ -1,8 +1,8 @@
 # RNOJ01 - Another Code R Kioku no Tobira
 [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 = You can't interact with some objects ingame.
-EmulationStateId = 3
+EmulationIssues = 
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -17,3 +17,5 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/User/GameConfig/RNOP01.ini b/Data/User/GameConfig/RNOP01.ini
index 351cf5c069..1216832ac3 100644
--- a/Data/User/GameConfig/RNOP01.ini
+++ b/Data/User/GameConfig/RNOP01.ini
@@ -1,8 +1,8 @@
 # RNOP01 - Another Code:R
 [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 = You can't interact with some objects ingame.
-EmulationStateId = 3
+EmulationIssues = 
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -17,3 +17,6 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+
diff --git a/Data/User/GameConfig/ROLE8P.ini b/Data/User/GameConfig/ROLE8P.ini
index 0bed89710d..450f94131d 100644
--- a/Data/User/GameConfig/ROLE8P.ini
+++ b/Data/User/GameConfig/ROLE8P.ini
@@ -8,4 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/ROUJAF.ini b/Data/User/GameConfig/ROUJAF.ini
index b2abb4e988..6300f9c9c0 100644
--- a/Data/User/GameConfig/ROUJAF.ini
+++ b/Data/User/GameConfig/ROUJAF.ini
@@ -8,3 +8,5 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/ROUPAF.ini b/Data/User/GameConfig/ROUPAF.ini
index 9da6c9826d..e362c4cf29 100644
--- a/Data/User/GameConfig/ROUPAF.ini
+++ b/Data/User/GameConfig/ROUPAF.ini
@@ -8,3 +8,6 @@ EmulationIssues = Use direct3D11 plugin (r6932)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/ROWE08.ini b/Data/User/GameConfig/ROWE08.ini
index 051a35c615..77c8759e7a 100644
--- a/Data/User/GameConfig/ROWE08.ini
+++ b/Data/User/GameConfig/ROWE08.ini
@@ -2,7 +2,7 @@
 [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 = Game menu issues (r6564)
+EmulationIssues = Use dx9 plugin. Game menu issues (r6564)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,6 +13,11 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBAccessEnable = True
+EFBToTextureEnable = False
+EFBCopyEnable = True
 
diff --git a/Data/User/GameConfig/ROWJ08.ini b/Data/User/GameConfig/ROWJ08.ini
index 0cc6318580..be9440a87c 100644
--- a/Data/User/GameConfig/ROWJ08.ini
+++ b/Data/User/GameConfig/ROWJ08.ini
@@ -2,7 +2,7 @@
 [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 = Game menu issues (r6564)
+EmulationIssues = Use dx9 plugin. Game menu issues (r6564)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,5 +13,10 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBAccessEnable = True
+EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/User/GameConfig/ROWP08.ini b/Data/User/GameConfig/ROWP08.ini
index 137561bfb3..a7f764a350 100644
--- a/Data/User/GameConfig/ROWP08.ini
+++ b/Data/User/GameConfig/ROWP08.ini
@@ -2,7 +2,7 @@
 [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 = Game menu issues (r6564)
+EmulationIssues = Use dx9 plugin. Game menu issues (r6564)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,5 +13,10 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
-EFBAccessEnable = True
\ No newline at end of file
+EFBAccessEnable = True
+EFBToTextureEnable = False
+EFBCopyEnable = True
diff --git a/Data/User/GameConfig/RPBE01.ini b/Data/User/GameConfig/RPBE01.ini
index cc4c2282e5..317a718b98 100644
--- a/Data/User/GameConfig/RPBE01.ini
+++ b/Data/User/GameConfig/RPBE01.ini
@@ -2,7 +2,7 @@
 [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 = 
+EmulationIssues = Needs texture cache set to "Safe"(r6906).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 
diff --git a/Data/User/GameConfig/RPBJ01.ini b/Data/User/GameConfig/RPBJ01.ini
index 29f82ea4a9..4701961228 100644
--- a/Data/User/GameConfig/RPBJ01.ini
+++ b/Data/User/GameConfig/RPBJ01.ini
@@ -2,7 +2,7 @@
 [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 = 
+EmulationIssues = Needs texture cache set to "Safe"(r6906).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -12,4 +12,7 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
\ No newline at end of file
diff --git a/Data/User/GameConfig/RPBP01.ini b/Data/User/GameConfig/RPBP01.ini
index 7c4cdd5087..5e696efd6a 100644
--- a/Data/User/GameConfig/RPBP01.ini
+++ b/Data/User/GameConfig/RPBP01.ini
@@ -2,7 +2,7 @@
 [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 = 
+EmulationIssues = Needs texture cache set to "Safe"(r6906).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +13,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/RPJE7U.ini b/Data/User/GameConfig/RPJE7U.ini
index ce878fd88d..c9639856c5 100644
--- a/Data/User/GameConfig/RPJE7U.ini
+++ b/Data/User/GameConfig/RPJE7U.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/RPJJ99.ini b/Data/User/GameConfig/RPJJ99.ini
index c5145004c4..fe608fbbe1 100644
--- a/Data/User/GameConfig/RPJJ99.ini
+++ b/Data/User/GameConfig/RPJJ99.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 DlistCachingEnable = False
diff --git a/Data/User/GameConfig/RQ6EJJ.ini b/Data/User/GameConfig/RQ6EJJ.ini
index a92e512764..d9bcac7936 100644
--- a/Data/User/GameConfig/RQ6EJJ.ini
+++ b/Data/User/GameConfig/RQ6EJJ.ini
@@ -2,6 +2,9 @@
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video_Hacks]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 BlockMerging = 1
diff --git a/Data/User/GameConfig/RQ6PKM.ini b/Data/User/GameConfig/RQ6PKM.ini
index 1923406043..cfc87e365d 100644
--- a/Data/User/GameConfig/RQ6PKM.ini
+++ b/Data/User/GameConfig/RQ6PKM.ini
@@ -2,6 +2,9 @@
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video_Hacks]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 BlockMerging = 1
diff --git a/Data/User/GameConfig/RQ6XKM.ini b/Data/User/GameConfig/RQ6XKM.ini
index b4e43089de..b8e03b8b37 100644
--- a/Data/User/GameConfig/RQ6XKM.ini
+++ b/Data/User/GameConfig/RQ6XKM.ini
@@ -2,6 +2,9 @@
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video_Hacks]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Core]
 MMU = 1
 BlockMerging = 1
diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/User/GameConfig/RQREXJ.ini
index 1e153e176e..83b5f9f9ce 100644
--- a/Data/User/GameConfig/RQREXJ.ini
+++ b/Data/User/GameConfig/RQREXJ.ini
@@ -1,4 +1,7 @@
 # RQREXJ - The Sky Crawlers
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Video_Hacks]
 [Core]
 CPUThread = 0
diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/User/GameConfig/RQRJAF.ini
index 01f4f827d4..b60c421d9a 100644
--- a/Data/User/GameConfig/RQRJAF.ini
+++ b/Data/User/GameConfig/RQRJAF.ini
@@ -1,4 +1,7 @@
 # RQRJAF - The Sky Crawlers
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Video_Hacks]
 [Core]
 CPUThread = 0
diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/User/GameConfig/RQRPAF.ini
index d5c6807696..7253a3ac5f 100644
--- a/Data/User/GameConfig/RQRPAF.ini
+++ b/Data/User/GameConfig/RQRPAF.ini
@@ -1,4 +1,7 @@
 # RQRPAF - The Sky Crawlers
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 128
 [Video_Hacks]
 [Core]
 CPUThread = 0
diff --git a/Data/User/GameConfig/RRBE41.ini b/Data/User/GameConfig/RRBE41.ini
index ec6dc890e8..70148f2943 100644
--- a/Data/User/GameConfig/RRBE41.ini
+++ b/Data/User/GameConfig/RRBE41.ini
@@ -1,17 +1,6 @@
 # RRBE41 - Rayman Raving Rabbids
 [Core] Values set here will override the main dolphin settings.
-CPUThread = 0
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core is unstable.Use direct3d11 for less glitches. Slow.(r7687)
+EmulationStateId = 1
 [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 = 
-[Gecko]
-[Wii]
\ No newline at end of file
diff --git a/Data/User/GameConfig/RRBJ41.ini b/Data/User/GameConfig/RRBJ41.ini
deleted file mode 100644
index 498d8aca84..0000000000
--- a/Data/User/GameConfig/RRBJ41.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RRBJ41 - Rayman Raving Rabbids
-[Core] Values set here will override the main dolphin settings.
-CPUThread = 0
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core is unstable.Use direct3d11 for less glitches. Slow.(r7687)
-[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 = 
-[Gecko]
-[Wii]
diff --git a/Data/User/GameConfig/RRBP41.ini b/Data/User/GameConfig/RRBP41.ini
deleted file mode 100644
index ae27d7f6db..0000000000
--- a/Data/User/GameConfig/RRBP41.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# RRBP41 - Rayman Raving Rabbids
-[Core] Values set here will override the main dolphin settings.
-CPUThread = 0
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
-EmulationIssues = Dual core is unstable.Use direct3d11 for less glitches. Slow.(r7687)
-[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 = 
-[Gecko]
-[Wii]
diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/User/GameConfig/RRKE70.ini
index 57121c93e9..9a28e7535d 100644
--- a/Data/User/GameConfig/RRKE70.ini
+++ b/Data/User/GameConfig/RRKE70.ini
@@ -1,4 +1,7 @@
 # RRKE70 - Alone In The Dark
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/User/GameConfig/RRKP70.ini
index 02b8855b0f..04cdba86b7 100644
--- a/Data/User/GameConfig/RRKP70.ini
+++ b/Data/User/GameConfig/RRKP70.ini
@@ -1,4 +1,7 @@
 # RRKP70 - Alone In The Dark
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RSLEAF.ini b/Data/User/GameConfig/RSLEAF.ini
index 7d0d533b24..ff0b93d089 100644
--- a/Data/User/GameConfig/RSLEAF.ini
+++ b/Data/User/GameConfig/RSLEAF.ini
@@ -1,4 +1,7 @@
 # RSLEAF - SOULCALIBUR Legends
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RSLJAF.ini b/Data/User/GameConfig/RSLJAF.ini
index 8a7767dcfd..cdaa23bae8 100644
--- a/Data/User/GameConfig/RSLJAF.ini
+++ b/Data/User/GameConfig/RSLJAF.ini
@@ -1,4 +1,7 @@
 # RSLJAF - SOULCALIBUR Legends
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RSLKAF.ini b/Data/User/GameConfig/RSLKAF.ini
index 19283ceb82..190f5ba029 100644
--- a/Data/User/GameConfig/RSLKAF.ini
+++ b/Data/User/GameConfig/RSLKAF.ini
@@ -1,4 +1,7 @@
 # RSLKAF - SOULCALIBUR Legends
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RSLPAF.ini b/Data/User/GameConfig/RSLPAF.ini
index 0c6efbbc73..faf79d36e3 100644
--- a/Data/User/GameConfig/RSLPAF.ini
+++ b/Data/User/GameConfig/RSLPAF.ini
@@ -1,4 +1,7 @@
 # RSLPAF - SOULCALIBUR Legends
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/RSXE69.ini b/Data/User/GameConfig/RSXE69.ini
index 0bc8bbb94a..63c8043a57 100644
--- a/Data/User/GameConfig/RSXE69.ini
+++ b/Data/User/GameConfig/RSXE69.ini
@@ -1,20 +1,11 @@
 # RSXE69 - SSX Blur
 [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 = 3
-EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly.
+EmulationStateId = 1
+EmulationIssues = Black screen
 [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 = 
 [Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Video_Hacks]
-[Wii]
+
diff --git a/Data/User/GameConfig/RSXJ13.ini b/Data/User/GameConfig/RSXJ13.ini
deleted file mode 100644
index 247b385173..0000000000
--- a/Data/User/GameConfig/RSXJ13.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RSXJ13 - SSX Blur
-[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 = 3
-EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly.
-[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 = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Video_Hacks]
-[Wii]
diff --git a/Data/User/GameConfig/RSXK69.ini b/Data/User/GameConfig/RSXK69.ini
deleted file mode 100644
index 53b4db39f6..0000000000
--- a/Data/User/GameConfig/RSXK69.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# RSXK69 - SSX Blur
-[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 = 3
-EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly.
-[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 = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Video_Hacks]
-[Wii]
diff --git a/Data/User/GameConfig/RSXP69.ini b/Data/User/GameConfig/RSXP69.ini
index 4ae8f28258..7673f9020d 100644
--- a/Data/User/GameConfig/RSXP69.ini
+++ b/Data/User/GameConfig/RSXP69.ini
@@ -1,8 +1,8 @@
 # RSXP69 - SSX Wii
 [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 = 3
-EmulationIssues = Needs Wii nand dump (wii menu installed) to get ingame(reconnect wiimote if necessary) and LLE for proper audio. Enabling EFB cpu access will give a proper bloom effect but the game will slow down substantially. Due to the above it is a very demanding game in order to be emulated properly.
+EmulationStateId = 1
+EmulationIssues = crash after strap warning
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,9 +13,3 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Video_Hacks]
-[Wii]
-
diff --git a/Data/User/GameConfig/RUYE41.ini b/Data/User/GameConfig/RUYE41.ini
index 7ec1054569..b2757b44c5 100644
--- a/Data/User/GameConfig/RUYE41.ini
+++ b/Data/User/GameConfig/RUYE41.ini
@@ -7,13 +7,5 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
 [Gecko]
-[Video_Hacks]
-EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+
diff --git a/Data/User/GameConfig/RX3E01.ini b/Data/User/GameConfig/RX3E01.ini
index db7cce96f8..39f17958fe 100644
--- a/Data/User/GameConfig/RX3E01.ini
+++ b/Data/User/GameConfig/RX3E01.ini
@@ -8,4 +8,7 @@ EmulationIssues = Tested with (r6521)
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/RZDE01.ini b/Data/User/GameConfig/RZDE01.ini
index 9b7ebfee31..05ef8be870 100644
--- a/Data/User/GameConfig/RZDE01.ini
+++ b/Data/User/GameConfig/RZDE01.ini
@@ -20,3 +20,6 @@ PH_ZFar =
 [Gecko]
 [Video_Hacks]
 EFBAccessEnable = True
+[Video_Settings]
+SafeTextureCache = False
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/RZDJ01.ini b/Data/User/GameConfig/RZDJ01.ini
index 7f2ddb00f1..691be27e10 100644
--- a/Data/User/GameConfig/RZDJ01.ini
+++ b/Data/User/GameConfig/RZDJ01.ini
@@ -19,4 +19,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
-EFBAccessEnable = True
\ No newline at end of file
+EFBAccessEnable = True
+[Video_Settings]
+SafeTextureCache = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/RZDK01.ini b/Data/User/GameConfig/RZDK01.ini
index 2f6d5d7a24..b0007ffe6f 100644
--- a/Data/User/GameConfig/RZDK01.ini
+++ b/Data/User/GameConfig/RZDK01.ini
@@ -19,4 +19,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
-EFBAccessEnable = True
\ No newline at end of file
+EFBAccessEnable = True
+[Video_Settings]
+SafeTextureCache = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/RZDP01.ini b/Data/User/GameConfig/RZDP01.ini
index 6c5cc20af0..e26bff70b2 100644
--- a/Data/User/GameConfig/RZDP01.ini
+++ b/Data/User/GameConfig/RZDP01.ini
@@ -19,4 +19,6 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
-EFBAccessEnable = True
\ No newline at end of file
+EFBAccessEnable = True
+[Video_Settings]
+SafeTextureCache = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/User/GameConfig/RZJD69.ini
index 809af4f4b1..b5511f120e 100644
--- a/Data/User/GameConfig/RZJD69.ini
+++ b/Data/User/GameConfig/RZJD69.ini
@@ -8,3 +8,5 @@ EmulationIssues =
 ProjectionHack = 0
 [ActionReplay]
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/User/GameConfig/RZJE69.ini
index 6140e3f0a5..3999569fcf 100644
--- a/Data/User/GameConfig/RZJE69.ini
+++ b/Data/User/GameConfig/RZJE69.ini
@@ -13,5 +13,8 @@ PH_ZNear =
 PH_ZFar = 
 [ActionReplay]
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/User/GameConfig/RZJJ13.ini
index fb6d6903b5..2054dfecf7 100644
--- a/Data/User/GameConfig/RZJJ13.ini
+++ b/Data/User/GameConfig/RZJJ13.ini
@@ -8,3 +8,5 @@ EmulationIssues =
 ProjectionHack = 0
 [ActionReplay]
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/User/GameConfig/RZJP69.ini
index c4f3a45c70..f6bbffccb3 100644
--- a/Data/User/GameConfig/RZJP69.ini
+++ b/Data/User/GameConfig/RZJP69.ini
@@ -26,4 +26,6 @@ $Infinite Health [TNTkryzt]
 $Infinite Ammo [TNTkryzt]
 0421AA54 3BC00000
 $Rapid Fire [TNTkryzt]
-0423A4DC 60000000
\ No newline at end of file
+0423A4DC 60000000
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/S2WE78.ini b/Data/User/GameConfig/S2WE78.ini
index d5e67048cd..6c5eb28f80 100644
--- a/Data/User/GameConfig/S2WE78.ini
+++ b/Data/User/GameConfig/S2WE78.ini
@@ -1,4 +1,7 @@
 # S2WE78 - WWE All Stars
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/Data/User/GameConfig/S2WP78.ini b/Data/User/GameConfig/S2WP78.ini
index d37598258c..12669e1c62 100644
--- a/Data/User/GameConfig/S2WP78.ini
+++ b/Data/User/GameConfig/S2WP78.ini
@@ -1,4 +1,7 @@
 # S2WP78 - WWE All Stars
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/Data/User/GameConfig/S3BEWR.ini b/Data/User/GameConfig/S3BEWR.ini
index b45f3cd925..b6bafb956c 100644
--- a/Data/User/GameConfig/S3BEWR.ini
+++ b/Data/User/GameConfig/S3BEWR.ini
@@ -1,4 +1,7 @@
 # S3BEWR - Batman: The Brave and the Bold
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
 [Video]
diff --git a/Data/User/GameConfig/S3BPWR.ini b/Data/User/GameConfig/S3BPWR.ini
index 627008a404..2aa2b5049c 100644
--- a/Data/User/GameConfig/S3BPWR.ini
+++ b/Data/User/GameConfig/S3BPWR.ini
@@ -1,4 +1,7 @@
 # S3BPWR - Batman: The Brave and the Bold
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 DlistCachingEnable = False
 [Video]
diff --git a/Data/User/GameConfig/S59E01.ini b/Data/User/GameConfig/S59E01.ini
index 50a264e3f5..adac044e0c 100644
--- a/Data/User/GameConfig/S59E01.ini
+++ b/Data/User/GameConfig/S59E01.ini
@@ -7,4 +7,6 @@ EmulationStateId = 5
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/S59JC8.ini b/Data/User/GameConfig/S59JC8.ini
index 769f0416c4..a35db392e7 100644
--- a/Data/User/GameConfig/S59JC8.ini
+++ b/Data/User/GameConfig/S59JC8.ini
@@ -7,4 +7,6 @@ EmulationStateId = 5
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/S59P01.ini b/Data/User/GameConfig/S59P01.ini
index 578e7b588d..f903683190 100644
--- a/Data/User/GameConfig/S59P01.ini
+++ b/Data/User/GameConfig/S59P01.ini
@@ -8,3 +8,6 @@ EmulationStateId = 5
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/S75E69.ini b/Data/User/GameConfig/S75E69.ini
index 5cf6bf206a..c831a31231 100644
--- a/Data/User/GameConfig/S75E69.ini
+++ b/Data/User/GameConfig/S75E69.ini
@@ -14,5 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
 EFBScale = 1
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/S75P69.ini b/Data/User/GameConfig/S75P69.ini
index 29cc185b92..6da8aa338c 100644
--- a/Data/User/GameConfig/S75P69.ini
+++ b/Data/User/GameConfig/S75P69.ini
@@ -14,4 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
+SafeTextureCache = True
 EFBScale = 1
diff --git a/Data/User/GameConfig/SAKENS.ini b/Data/User/GameConfig/SAKENS.ini
index 866fb9d272..f8c4f52479 100644
--- a/Data/User/GameConfig/SAKENS.ini
+++ b/Data/User/GameConfig/SAKENS.ini
@@ -8,4 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/SAKPNS.ini b/Data/User/GameConfig/SAKPNS.ini
index e80cff0cd3..e702bc182f 100644
--- a/Data/User/GameConfig/SAKPNS.ini
+++ b/Data/User/GameConfig/SAKPNS.ini
@@ -7,4 +7,6 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/SB3E08.ini b/Data/User/GameConfig/SB3E08.ini
index 2f7c3f4620..110fee08ed 100644
--- a/Data/User/GameConfig/SB3E08.ini
+++ b/Data/User/GameConfig/SB3E08.ini
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/SB3J08.ini b/Data/User/GameConfig/SB3J08.ini
index 87b5878d9c..e7b6b6a3ef 100644
--- a/Data/User/GameConfig/SB3J08.ini
+++ b/Data/User/GameConfig/SB3J08.ini
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
\ No newline at end of file
diff --git a/Data/User/GameConfig/SB3P08.ini b/Data/User/GameConfig/SB3P08.ini
index 10f6a9eaa3..e6d3b168ea 100644
--- a/Data/User/GameConfig/SB3P08.ini
+++ b/Data/User/GameConfig/SB3P08.ini
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
diff --git a/Data/User/GameConfig/SBDE08.ini b/Data/User/GameConfig/SBDE08.ini
index bc452f9a76..ca64242918 100644
--- a/Data/User/GameConfig/SBDE08.ini
+++ b/Data/User/GameConfig/SBDE08.ini
@@ -12,4 +12,7 @@ PH_SZFar = 1
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/SBDJ08.ini b/Data/User/GameConfig/SBDJ08.ini
index f230a5d4c0..a281b91c1a 100644
--- a/Data/User/GameConfig/SBDJ08.ini
+++ b/Data/User/GameConfig/SBDJ08.ini
@@ -13,3 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/SBDK08.ini b/Data/User/GameConfig/SBDK08.ini
index 8ad914f40d..d3166632f1 100644
--- a/Data/User/GameConfig/SBDK08.ini
+++ b/Data/User/GameConfig/SBDK08.ini
@@ -13,3 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/SBDP08.ini b/Data/User/GameConfig/SBDP08.ini
index 332a34e86b..529c32a43a 100644
--- a/Data/User/GameConfig/SBDP08.ini
+++ b/Data/User/GameConfig/SBDP08.ini
@@ -13,3 +13,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 0.5
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/SCAE18.ini b/Data/User/GameConfig/SCAE18.ini
index 6025bde64d..6a41856208 100644
--- a/Data/User/GameConfig/SCAE18.ini
+++ b/Data/User/GameConfig/SCAE18.ini
@@ -1,6 +1,9 @@
 # SCAE18 - CALLING
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SCAJ18.ini b/Data/User/GameConfig/SCAJ18.ini
index d219b11ff4..7ba36f6af5 100644
--- a/Data/User/GameConfig/SCAJ18.ini
+++ b/Data/User/GameConfig/SCAJ18.ini
@@ -1,6 +1,9 @@
 # SCAJ18 - CALLING Kuroki Chakushin
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SCAP18.ini b/Data/User/GameConfig/SCAP18.ini
index 2c77f5eabb..6fec8cd117 100644
--- a/Data/User/GameConfig/SCAP18.ini
+++ b/Data/User/GameConfig/SCAP18.ini
@@ -1,6 +1,9 @@
 # SCAP18 - CALLING
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SD2E41.ini b/Data/User/GameConfig/SD2E41.ini
index 74129642c1..e5b2d686c7 100644
--- a/Data/User/GameConfig/SD2E41.ini
+++ b/Data/User/GameConfig/SD2E41.ini
@@ -1,4 +1,7 @@
 # SD2E41 - Just Dance 2
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/User/GameConfig/SD2P41.ini
index 6ae5995dc9..d446b13273 100644
--- a/Data/User/GameConfig/SD2P41.ini
+++ b/Data/User/GameConfig/SD2P41.ini
@@ -1,4 +1,7 @@
 # SD2P41 - Just Dance 2
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/User/GameConfig/SD2Y41.ini
index 6749f60dea..3af0cc5950 100644
--- a/Data/User/GameConfig/SD2Y41.ini
+++ b/Data/User/GameConfig/SD2Y41.ini
@@ -1,4 +1,7 @@
 # SD2Y41 - Just Dance 2
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Video]
diff --git a/Data/User/GameConfig/SDWE18.ini b/Data/User/GameConfig/SDWE18.ini
index fc10249dc3..e112396904 100644
--- a/Data/User/GameConfig/SDWE18.ini
+++ b/Data/User/GameConfig/SDWE18.ini
@@ -14,7 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-
+[Video_Enhancements]
+PostProcessingShader = 
diff --git a/Data/User/GameConfig/SDWJ18.ini b/Data/User/GameConfig/SDWJ18.ini
index c7a9616c8c..78db0a7acc 100644
--- a/Data/User/GameConfig/SDWJ18.ini
+++ b/Data/User/GameConfig/SDWJ18.ini
@@ -14,7 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-
diff --git a/Data/User/GameConfig/SDWP18.ini b/Data/User/GameConfig/SDWP18.ini
index 251a7cfbc9..aa4fba4d2f 100644
--- a/Data/User/GameConfig/SDWP18.ini
+++ b/Data/User/GameConfig/SDWP18.ini
@@ -14,6 +14,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
+[Video_Enhancements]
+PostProcessingShader = 
diff --git a/Data/User/GameConfig/SE2P69.ini b/Data/User/GameConfig/SE2P69.ini
index 61d19e0e54..55d89a5b50 100644
--- a/Data/User/GameConfig/SE2P69.ini
+++ b/Data/User/GameConfig/SE2P69.ini
@@ -8,5 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SEAE69.ini b/Data/User/GameConfig/SEAE69.ini
index ea27ad50a2..f9fe4d44aa 100644
--- a/Data/User/GameConfig/SEAE69.ini
+++ b/Data/User/GameConfig/SEAE69.ini
@@ -8,5 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SEAJ13.ini b/Data/User/GameConfig/SEAJ13.ini
index ab22e3105d..edf92d59d9 100644
--- a/Data/User/GameConfig/SEAJ13.ini
+++ b/Data/User/GameConfig/SEAJ13.ini
@@ -8,5 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SEAP69.ini b/Data/User/GameConfig/SEAP69.ini
index 1c6f75ac40..81ca65bf49 100644
--- a/Data/User/GameConfig/SEAP69.ini
+++ b/Data/User/GameConfig/SEAP69.ini
@@ -8,5 +8,7 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Enhancements]
 ForceFiltering = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/User/GameConfig/SEME4Q.ini
index b3a36b73d6..3955caebb4 100644
--- a/Data/User/GameConfig/SEME4Q.ini
+++ b/Data/User/GameConfig/SEME4Q.ini
@@ -13,6 +13,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
 [Video_Hacks]
diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/User/GameConfig/SEMP4Q.ini
index 127e6440ba..0d2acb5188 100644
--- a/Data/User/GameConfig/SEMP4Q.ini
+++ b/Data/User/GameConfig/SEMP4Q.ini
@@ -13,6 +13,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
 [Video_Hacks]
diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/User/GameConfig/SEMX4Q.ini
index 87c8685b68..d1c180f1ba 100644
--- a/Data/User/GameConfig/SEMX4Q.ini
+++ b/Data/User/GameConfig/SEMX4Q.ini
@@ -13,6 +13,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
 [Video_Enhancements]
 ForceFiltering = False
 [Video_Hacks]
diff --git a/Data/User/GameConfig/SF8E01.ini b/Data/User/GameConfig/SF8E01.ini
index 706185036c..7be1be3c3f 100644
--- a/Data/User/GameConfig/SF8E01.ini
+++ b/Data/User/GameConfig/SF8E01.ini
@@ -14,5 +14,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Wii]
 DisableWiimoteSpeaker = 1
diff --git a/Data/User/GameConfig/SF8J01.ini b/Data/User/GameConfig/SF8J01.ini
index 09ab9ee04d..a7a58eab98 100644
--- a/Data/User/GameConfig/SF8J01.ini
+++ b/Data/User/GameConfig/SF8J01.ini
@@ -14,5 +14,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Wii]
 DisableWiimoteSpeaker = 1
diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/User/GameConfig/SF8P01.ini
index ee2d37765e..5b2cf6121f 100644
--- a/Data/User/GameConfig/SF8P01.ini
+++ b/Data/User/GameConfig/SF8P01.ini
@@ -14,5 +14,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Wii]
 DisableWiimoteSpeaker = 1
\ No newline at end of file
diff --git a/Data/User/GameConfig/SFWP69.ini b/Data/User/GameConfig/SFWP69.ini
index 5a3d3ab6fe..40eaf1269d 100644
--- a/Data/User/GameConfig/SFWP69.ini
+++ b/Data/User/GameConfig/SFWP69.ini
@@ -7,3 +7,5 @@ EmulationIssues = Lacks HLE Sound
 [ActionReplay] Add action replay cheats here.
 [Video]
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/User/GameConfig/SHLPA4.ini
deleted file mode 100644
index 2b2c367929..0000000000
--- a/Data/User/GameConfig/SHLPA4.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# SHLPA4 - Silent Hill: Shattered Memories
-[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 = Flashlight glitches (r6521)
-[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 = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
\ No newline at end of file
diff --git a/Data/User/GameConfig/SILE78.ini b/Data/User/GameConfig/SILE78.ini
index 63623d77a9..f399598cb6 100644
--- a/Data/User/GameConfig/SILE78.ini
+++ b/Data/User/GameConfig/SILE78.ini
@@ -16,3 +16,6 @@ PH_ZFar =
 [Gecko]
 [Video_Hardware]
 VSync = False
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/SILP78.ini b/Data/User/GameConfig/SILP78.ini
index 8e01bfa1f4..dfd8bf299c 100644
--- a/Data/User/GameConfig/SILP78.ini
+++ b/Data/User/GameConfig/SILP78.ini
@@ -15,4 +15,7 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hardware]
-VSync = False
\ No newline at end of file
+VSync = False
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/SK3EEB.ini b/Data/User/GameConfig/SK3EEB.ini
index 722ef5f9a3..cd1026b8da 100644
--- a/Data/User/GameConfig/SK3EEB.ini
+++ b/Data/User/GameConfig/SK3EEB.ini
@@ -13,5 +13,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 PostProcessingShader = 
diff --git a/Data/User/GameConfig/SMFE4Q.ini b/Data/User/GameConfig/SMFE4Q.ini
deleted file mode 100644
index 162c68e981..0000000000
--- a/Data/User/GameConfig/SMFE4Q.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# SMFE4Q - Phineas and Ferb Across the 2nd Dimension
-[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 = 
-[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 = 
-[Gecko]
-[Video_Settings]
-UseXFB = True
-UseRealXFB = False
-[Video_Hacks]
-EFBEmulateFormatChanges = False
diff --git a/Data/User/GameConfig/SMNE01.ini b/Data/User/GameConfig/SMNE01.ini
index 3295f5f03f..4e903aa999 100644
--- a/Data/User/GameConfig/SMNE01.ini
+++ b/Data/User/GameConfig/SMNE01.ini
@@ -37,5 +37,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SMNJ01.ini b/Data/User/GameConfig/SMNJ01.ini
index b0e7b42a39..5e182fc027 100644
--- a/Data/User/GameConfig/SMNJ01.ini
+++ b/Data/User/GameConfig/SMNJ01.ini
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SMNK01.ini b/Data/User/GameConfig/SMNK01.ini
index d5c04d2142..b4701e7f9c 100644
--- a/Data/User/GameConfig/SMNK01.ini
+++ b/Data/User/GameConfig/SMNK01.ini
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SMNP01.ini b/Data/User/GameConfig/SMNP01.ini
index bb2ec872f4..f53b9e0f13 100644
--- a/Data/User/GameConfig/SMNP01.ini
+++ b/Data/User/GameConfig/SMNP01.ini
@@ -22,6 +22,9 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 DlistCachingEnable = False
 
diff --git a/Data/User/GameConfig/SMNW01.ini b/Data/User/GameConfig/SMNW01.ini
index 46a6c639e3..bf01c022b7 100644
--- a/Data/User/GameConfig/SMNW01.ini
+++ b/Data/User/GameConfig/SMNW01.ini
@@ -13,5 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 [Video_Hacks]
 DlistCachingEnable = False
\ No newline at end of file
diff --git a/Data/User/GameConfig/SNJE69.ini b/Data/User/GameConfig/SNJE69.ini
index 66f52ce2af..fdc2b28e7f 100644
--- a/Data/User/GameConfig/SNJE69.ini
+++ b/Data/User/GameConfig/SNJE69.ini
@@ -30,4 +30,7 @@ $Time Stop ( - and B Button on/off ) [ZiT]
 04521C84 60000000
 CC000000 00000000
 04521C84 D01D0040
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 
diff --git a/Data/User/GameConfig/SNJP69.ini b/Data/User/GameConfig/SNJP69.ini
index 17072959cf..5b87dc2614 100644
--- a/Data/User/GameConfig/SNJP69.ini
+++ b/Data/User/GameConfig/SNJP69.ini
@@ -8,4 +8,6 @@ EmulationStateId = 4
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
 
diff --git a/Data/User/GameConfig/SPTJEB.ini b/Data/User/GameConfig/SPTJEB.ini
index 94012593be..3d223c0d5a 100644
--- a/Data/User/GameConfig/SPTJEB.ini
+++ b/Data/User/GameConfig/SPTJEB.ini
@@ -7,4 +7,6 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
-[Gecko]
\ No newline at end of file
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/SPVEA4.ini b/Data/User/GameConfig/SPVEA4.ini
index 8bd17cad23..f03ffc2272 100644
--- a/Data/User/GameConfig/SPVEA4.ini
+++ b/Data/User/GameConfig/SPVEA4.ini
@@ -1,4 +1,7 @@
 # SPVEA4 - Pro Evolution Soccer 2011
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SPVPA4.ini b/Data/User/GameConfig/SPVPA4.ini
index 0e71f5ec9c..6b1ebabca9 100644
--- a/Data/User/GameConfig/SPVPA4.ini
+++ b/Data/User/GameConfig/SPVPA4.ini
@@ -1,4 +1,7 @@
 # SPVPA4 - Pro Evolution Soccer 2011
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SPVXA4.ini b/Data/User/GameConfig/SPVXA4.ini
index dbaf0ec24b..b69413e399 100644
--- a/Data/User/GameConfig/SPVXA4.ini
+++ b/Data/User/GameConfig/SPVXA4.ini
@@ -1,4 +1,7 @@
 # SPVXA4 - Pro Evolution Soccer 2011
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SPVYA4.ini b/Data/User/GameConfig/SPVYA4.ini
index 6ac9001f01..81b7d14bb4 100644
--- a/Data/User/GameConfig/SPVYA4.ini
+++ b/Data/User/GameConfig/SPVYA4.ini
@@ -1,4 +1,7 @@
 # SPVYA4 - Pro Evolution Soccer 2011
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/SVME01.ini b/Data/User/GameConfig/SVME01.ini
index ffae620bfe..e4f82dac22 100644
--- a/Data/User/GameConfig/SVME01.ini
+++ b/Data/User/GameConfig/SVME01.ini
@@ -2,7 +2,7 @@
 [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 = Use LLE audio to fix sound. Enable bilinear filtering for a more smooth but blurry image.(r7687)
+EmulationIssues = Use LLE audio to fix sound. Use Opengl backend and set efb scale to integral for better image. Enable bilinear filtering for a more smooth but blurry image(r7482)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
diff --git a/Data/User/GameConfig/SVMJ01.ini b/Data/User/GameConfig/SVMJ01.ini
index dcecbb595e..2014fcfdb1 100644
--- a/Data/User/GameConfig/SVMJ01.ini
+++ b/Data/User/GameConfig/SVMJ01.ini
@@ -2,7 +2,7 @@
 [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 = Use LLE audio to fix sound. Enable bilinear filtering for a more smooth but blurry image.(r7687)
+EmulationIssues = Use LLE audio to fix sound. Use Opengl backend and set efb scale to integral for better image. Enable bilinear filtering for a more smooth but blurry image(r7482)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,7 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
-
diff --git a/Data/User/GameConfig/SVMP01.ini b/Data/User/GameConfig/SVMP01.ini
index 300dd23f6a..e122dc00e1 100644
--- a/Data/User/GameConfig/SVMP01.ini
+++ b/Data/User/GameConfig/SVMP01.ini
@@ -2,7 +2,7 @@
 [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 = Use LLE audio to fix sound. Enable bilinear filtering for a more smooth but blurry image.(r7687)
+EmulationIssues = Use LLE audio to fix sound. Use Opengl backend and set efb scale to integral for better image. Enable bilinear filtering for a more smooth but blurry image(r7482)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Hacks]
+EFBToTextureEnable = False
 EFBCopyEnable = True
-EFBCopyRAMEnable = True
-EFBCopyVirtualEnable = True
diff --git a/Data/User/GameConfig/SXCE52.ini b/Data/User/GameConfig/SXCE52.ini
index ad4f06a4a8..b003fc70d3 100644
--- a/Data/User/GameConfig/SXCE52.ini
+++ b/Data/User/GameConfig/SXCE52.ini
@@ -8,3 +8,7 @@ EmulationIssues = Create a quitar profile and use that for controls instead of w
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/SXCP52.ini b/Data/User/GameConfig/SXCP52.ini
index 5cc9846d2a..29bf6aab48 100644
--- a/Data/User/GameConfig/SXCP52.ini
+++ b/Data/User/GameConfig/SXCP52.ini
@@ -8,3 +8,5 @@ EmulationIssues = Create a quitar profile and use that for controls instead of w
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/WF4EGD.ini b/Data/User/GameConfig/WF4EGD.ini
index 96287ccee3..38e0f8875b 100644
--- a/Data/User/GameConfig/WF4EGD.ini
+++ b/Data/User/GameConfig/WF4EGD.ini
@@ -8,3 +8,5 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
diff --git a/Data/User/GameConfig/WR9E08.ini b/Data/User/GameConfig/WR9E08.ini
index 291be8f011..b4b24bdb60 100644
--- a/Data/User/GameConfig/WR9E08.ini
+++ b/Data/User/GameConfig/WR9E08.ini
@@ -16,4 +16,6 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-EFBScale = 2
\ No newline at end of file
+EFBScale = 2
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/WR9P08.ini b/Data/User/GameConfig/WR9P08.ini
index 0a3e407888..b10a3cc2cb 100644
--- a/Data/User/GameConfig/WR9P08.ini
+++ b/Data/User/GameConfig/WR9P08.ini
@@ -16,4 +16,6 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-EFBScale = 2
\ No newline at end of file
+EFBScale = 2
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/WRXE08.ini b/Data/User/GameConfig/WRXE08.ini
index 28b83b32ea..63feb0023c 100644
--- a/Data/User/GameConfig/WRXE08.ini
+++ b/Data/User/GameConfig/WRXE08.ini
@@ -16,4 +16,6 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
 EFBScale = 2