From 544132bc3eaba753efc0d89ff748dc7ef2391fa5 Mon Sep 17 00:00:00 2001
From: "kostamarino@hotmail.com" <kostamarino@hotmail.com>
Date: Wed, 12 Oct 2011 19:04:23 +0300
Subject: [PATCH 1/2] Gameini database updates/additions. Affects SONIC GEMS
 COLLECTION, Star Wars Bounty Hunter, Bomberman Jetters, Shamu's Deep Sea
 Adventures, Cabela's Outdoor Adventures, Tony Hawk's Pro Skater 3, Viewtiful
 Joe Red Hot Rumble, Spider-Man SD etc. Also fixes issue 4888.

---
 Data/User/GameConfig/G2ME01.ini |  17 +++-
 Data/User/GameConfig/G2MP01.ini | 144 ++++++++++++++++++++++++++++++--
 Data/User/GameConfig/G2XE8P.ini |   8 +-
 Data/User/GameConfig/G2XP8P.ini |   8 +-
 Data/User/GameConfig/GAVP78.ini |  19 +++++
 Data/User/GameConfig/GAVY78.ini |  19 +++++
 Data/User/GameConfig/GBWD64.ini |  19 +++++
 Data/User/GameConfig/GBWE64.ini |  13 ++-
 Data/User/GameConfig/GBWF64.ini |  19 +++++
 Data/User/GameConfig/GBWP64.ini |  19 +++++
 Data/User/GameConfig/GEAE8P.ini |   3 +-
 Data/User/GameConfig/GEAP8P.ini |   3 +-
 Data/User/GameConfig/GG5E52.ini |  13 ++-
 Data/User/GameConfig/GJBE5G.ini |  17 +++-
 Data/User/GameConfig/GJZE52.ini |  16 ++++
 Data/User/GameConfig/GOAE52.ini |  16 ++++
 Data/User/GameConfig/GOSE41.ini |  16 ++++
 Data/User/GameConfig/GOSP41.ini |  16 ++++
 Data/User/GameConfig/GOSX41.ini |  16 ++++
 Data/User/GameConfig/GT3D52.ini |  18 ++++
 Data/User/GameConfig/GT3E52.ini |  18 ++++
 Data/User/GameConfig/GT3F52.ini |  18 ++++
 Data/User/GameConfig/GT3P52.ini |  18 ++++
 Data/User/GameConfig/GVCE08.ini |  18 ++++
 Data/User/GameConfig/GVCP08.ini |  13 ++-
 Data/User/GameConfig/GVJE08.ini |   5 +-
 Data/User/GameConfig/GVJJ08.ini |   4 +-
 Data/User/GameConfig/GVJP08.ini |   4 +-
 Data/User/GameConfig/SPDE52.ini |  20 +++++
 Data/User/GameConfig/SPDP52.ini |  20 +++++
 30 files changed, 528 insertions(+), 29 deletions(-)
 create mode 100644 Data/User/GameConfig/GAVP78.ini
 create mode 100644 Data/User/GameConfig/GAVY78.ini
 create mode 100644 Data/User/GameConfig/GBWD64.ini
 create mode 100644 Data/User/GameConfig/GBWF64.ini
 create mode 100644 Data/User/GameConfig/GBWP64.ini
 create mode 100644 Data/User/GameConfig/GJZE52.ini
 create mode 100644 Data/User/GameConfig/GOAE52.ini
 create mode 100644 Data/User/GameConfig/GOSE41.ini
 create mode 100644 Data/User/GameConfig/GOSP41.ini
 create mode 100644 Data/User/GameConfig/GOSX41.ini
 create mode 100644 Data/User/GameConfig/GT3D52.ini
 create mode 100644 Data/User/GameConfig/GT3E52.ini
 create mode 100644 Data/User/GameConfig/GT3F52.ini
 create mode 100644 Data/User/GameConfig/GT3P52.ini
 create mode 100644 Data/User/GameConfig/GVCE08.ini
 create mode 100644 Data/User/GameConfig/SPDE52.ini
 create mode 100644 Data/User/GameConfig/SPDP52.ini

diff --git a/Data/User/GameConfig/G2ME01.ini b/Data/User/GameConfig/G2ME01.ini
index d8807fcf07..0ecd587a67 100644
--- a/Data/User/GameConfig/G2ME01.ini
+++ b/Data/User/GameConfig/G2ME01.ini
@@ -2,8 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-Issues="Scanner does not work, music is buggy, scanner mode is buggy"
-EmulationIssues = 
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. 
 [Speedhacks]
 0x803758bc=400
 [OnFrame]
@@ -131,6 +130,20 @@ $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
diff --git a/Data/User/GameConfig/G2MP01.ini b/Data/User/GameConfig/G2MP01.ini
index ca94aac829..c3fb1fdac5 100644
--- a/Data/User/GameConfig/G2MP01.ini
+++ b/Data/User/GameConfig/G2MP01.ini
@@ -1,15 +1,147 @@
-# G2MP01 - Metroid Prime 2 Echoes[EmuState]
+# G2MP01 - Metroid Prime 2 Echoes
+[EmuState]
 #The Emulation State.
-EmulationStateId = 2
-Issues="Scanner does not work, music is buggy, scanner mode is buggy"
+EmulationStateId = 4
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. 
 [Speedhacks]
 #Patch OSYieldThread to take more time - MP2's idle loop is really stupid.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = needs safe texture cache and EFB to Ram
+$(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
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
diff --git a/Data/User/GameConfig/G2XE8P.ini b/Data/User/GameConfig/G2XE8P.ini
index 9f5533b5f2..be2e404a17 100644
--- a/Data/User/GameConfig/G2XE8P.ini
+++ b/Data/User/GameConfig/G2XE8P.ini
@@ -1,8 +1,9 @@
 # G2XE8P - SONIC GEMS COLLECTION
 [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 = Everything playable with minor glitches, except Sonic the Fighters.
+EmulationIssues = Everything playable with minor glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +14,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/G2XP8P.ini b/Data/User/GameConfig/G2XP8P.ini
index 820688756d..091b1b318a 100644
--- a/Data/User/GameConfig/G2XP8P.ini
+++ b/Data/User/GameConfig/G2XP8P.ini
@@ -1,8 +1,9 @@
 # G2XP8P - SONIC GEMS COLLECTION
 [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 = Everything playable with minor glitches, except Sonic the Fighters.
+EmulationIssues = Everything playable with minor glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +14,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/GAVP78.ini b/Data/User/GameConfig/GAVP78.ini
new file mode 100644
index 0000000000..97b105e31f
--- /dev/null
+++ b/Data/User/GameConfig/GAVP78.ini
@@ -0,0 +1,19 @@
+# GAVP78 - Avatar: The Legend of Aang
+[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 = 3
+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]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GAVY78.ini b/Data/User/GameConfig/GAVY78.ini
new file mode 100644
index 0000000000..fe7c2c8ce7
--- /dev/null
+++ b/Data/User/GameConfig/GAVY78.ini
@@ -0,0 +1,19 @@
+# GAVE78 - Avatar: The Legend of Aang
+[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 = 3
+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]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GBWD64.ini b/Data/User/GameConfig/GBWD64.ini
new file mode 100644
index 0000000000..993175d5c9
--- /dev/null
+++ b/Data/User/GameConfig/GBWD64.ini
@@ -0,0 +1,19 @@
+# GBWD64 - Star Wars Bounty Hunter
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[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 = True
diff --git a/Data/User/GameConfig/GBWE64.ini b/Data/User/GameConfig/GBWE64.ini
index 4ee318e208..914770f161 100644
--- a/Data/User/GameConfig/GBWE64.ini
+++ b/Data/User/GameConfig/GBWE64.ini
@@ -2,11 +2,18 @@
 [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 = 0
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
 [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 = True
diff --git a/Data/User/GameConfig/GBWF64.ini b/Data/User/GameConfig/GBWF64.ini
new file mode 100644
index 0000000000..40e3ed43af
--- /dev/null
+++ b/Data/User/GameConfig/GBWF64.ini
@@ -0,0 +1,19 @@
+# GBWF64 - Star Wars Bounty Hunter
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[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 = True
diff --git a/Data/User/GameConfig/GBWP64.ini b/Data/User/GameConfig/GBWP64.ini
new file mode 100644
index 0000000000..671a618a66
--- /dev/null
+++ b/Data/User/GameConfig/GBWP64.ini
@@ -0,0 +1,19 @@
+# GBWP64 - Star Wars Bounty Hunter
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[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 = True
diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/User/GameConfig/GEAE8P.ini
index c032bc3e73..9b6bdd2f3a 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 = 
+EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -16,4 +16,3 @@ PH_ZFar = 1.99998
 [Video_Settings]
 SafeTextureCache = True
 SafeTextureCacheColorSamples = 512
-
diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/User/GameConfig/GEAP8P.ini
index ff88026d45..2d7aef6141 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 = 
+EmulationIssues = LLE audio is needed to fix sound issues. Gfx glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,3 +15,4 @@ PH_ZFar = 1.99998
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GG5E52.ini b/Data/User/GameConfig/GG5E52.ini
index b6807f49e9..32174bc73d 100644
--- a/Data/User/GameConfig/GG5E52.ini
+++ b/Data/User/GameConfig/GG5E52.ini
@@ -1,7 +1,16 @@
 # GG5E52 - Cabela's(R) BGH 2005 Adv.
 [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.
-EmulationIssues = Black screen
-EmulationStateId = 1
+EmulationIssues = Needs Jitil to run. LLE audio fixes sound issues.
+EmulationStateId = 4
 [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/GJBE5G.ini b/Data/User/GameConfig/GJBE5G.ini
index 680342055a..25b06784f0 100644
--- a/Data/User/GameConfig/GJBE5G.ini
+++ b/Data/User/GameConfig/GJBE5G.ini
@@ -1,7 +1,20 @@
 # GJBE5G - Bomberman Jetters
 [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 = 1
-Issues="Does Nothing"
+EmulationStateId = 3
+EmulationIssues = Use D3D9 for less problems. Videos need Real XFB to show up. Graphic glitches / unstable during videos.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 0.1
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/User/GameConfig/GJZE52.ini b/Data/User/GameConfig/GJZE52.ini
new file mode 100644
index 0000000000..b37df81b13
--- /dev/null
+++ b/Data/User/GameConfig/GJZE52.ini
@@ -0,0 +1,16 @@
+# GJZE52 - Shamu's Deep Sea Adventures
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Jitil to run. LLE audio fixes some sound issues.
+[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/GOAE52.ini b/Data/User/GameConfig/GOAE52.ini
new file mode 100644
index 0000000000..8a3da2eb71
--- /dev/null
+++ b/Data/User/GameConfig/GOAE52.ini
@@ -0,0 +1,16 @@
+# GOAE52 - Cabela's Outdoor Adventures
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Jitil to run. LLE audio fixes sound issues.
+[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/GOSE41.ini b/Data/User/GameConfig/GOSE41.ini
new file mode 100644
index 0000000000..4682f2275c
--- /dev/null
+++ b/Data/User/GameConfig/GOSE41.ini
@@ -0,0 +1,16 @@
+# GOSE41 - Open Season
+[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 = 2
+EmulationIssues = Severe graphic issues.
+[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/GOSP41.ini b/Data/User/GameConfig/GOSP41.ini
new file mode 100644
index 0000000000..40fc6ad1f1
--- /dev/null
+++ b/Data/User/GameConfig/GOSP41.ini
@@ -0,0 +1,16 @@
+# GOSP41 - Open Season
+[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 = 2
+EmulationIssues = Severe graphic issues.
+[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/GOSX41.ini b/Data/User/GameConfig/GOSX41.ini
new file mode 100644
index 0000000000..92662f0a4c
--- /dev/null
+++ b/Data/User/GameConfig/GOSX41.ini
@@ -0,0 +1,16 @@
+# GOSX41 - Open Season
+[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 = 2
+EmulationIssues = Severe graphic issues.
+[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/GT3D52.ini b/Data/User/GameConfig/GT3D52.ini
new file mode 100644
index 0000000000..f50771d9b3
--- /dev/null
+++ b/Data/User/GameConfig/GT3D52.ini
@@ -0,0 +1,18 @@
+# GT3D52 - Tony Hawk's Pro Skater 3
+[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 = Neads real xfb for videos to display.
+[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 = True
diff --git a/Data/User/GameConfig/GT3E52.ini b/Data/User/GameConfig/GT3E52.ini
new file mode 100644
index 0000000000..dbfe35663e
--- /dev/null
+++ b/Data/User/GameConfig/GT3E52.ini
@@ -0,0 +1,18 @@
+# GT3E52 - Tony Hawk's Pro Skater 3
+[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 = Neads real xfb for videos to display.
+[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 = True
diff --git a/Data/User/GameConfig/GT3F52.ini b/Data/User/GameConfig/GT3F52.ini
new file mode 100644
index 0000000000..24d932371a
--- /dev/null
+++ b/Data/User/GameConfig/GT3F52.ini
@@ -0,0 +1,18 @@
+# GT3F52 - Tony Hawk's Pro Skater 3
+[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 = Neads real xfb for videos to display.
+[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 = True
diff --git a/Data/User/GameConfig/GT3P52.ini b/Data/User/GameConfig/GT3P52.ini
new file mode 100644
index 0000000000..aa644f6659
--- /dev/null
+++ b/Data/User/GameConfig/GT3P52.ini
@@ -0,0 +1,18 @@
+# GT3P52 - Tony Hawk's Pro Skater 3
+[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 = Neads real xfb for videos to display.
+[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 = True
diff --git a/Data/User/GameConfig/GVCE08.ini b/Data/User/GameConfig/GVCE08.ini
new file mode 100644
index 0000000000..4f7ece130f
--- /dev/null
+++ b/Data/User/GameConfig/GVCE08.ini
@@ -0,0 +1,18 @@
+# GVCE08 - Viewtiful Joe Red Hot Rumble
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
+[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 = True
diff --git a/Data/User/GameConfig/GVCP08.ini b/Data/User/GameConfig/GVCP08.ini
index fb766c6e32..3b98757de5 100644
--- a/Data/User/GameConfig/GVCP08.ini
+++ b/Data/User/GameConfig/GVCP08.ini
@@ -2,8 +2,17 @@
 [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 = Intro (and likely other) video blacked out.
+EmulationIssues = Needs real xfb for videos to show up.
 [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
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/User/GameConfig/GVJE08.ini b/Data/User/GameConfig/GVJE08.ini
index eca3a4cf5a..58c49806bc 100644
--- a/Data/User/GameConfig/GVJE08.ini
+++ b/Data/User/GameConfig/GVJE08.ini
@@ -1,7 +1,7 @@
 # GVJE08 - VIEWTIFUL JOE
 [EmuState]
-EmulationStateId = 0
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame]
 [ActionReplay]
 [Gecko]
@@ -15,4 +15,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-
diff --git a/Data/User/GameConfig/GVJJ08.ini b/Data/User/GameConfig/GVJJ08.ini
index bacabfab6d..da0a34a4bd 100644
--- a/Data/User/GameConfig/GVJJ08.ini
+++ b/Data/User/GameConfig/GVJJ08.ini
@@ -1,7 +1,7 @@
 # GVJJ08 - VIEWTIFUL JOE
 [EmuState]
-EmulationStateId = 0
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame]
 [ActionReplay]
 [Gecko]
diff --git a/Data/User/GameConfig/GVJP08.ini b/Data/User/GameConfig/GVJP08.ini
index 6f749f2947..c159fac154 100644
--- a/Data/User/GameConfig/GVJP08.ini
+++ b/Data/User/GameConfig/GVJP08.ini
@@ -1,7 +1,7 @@
 # GVJP08 - VIEWTIFUL JOE
 [EmuState]
-EmulationStateId = 0
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for videos to show up.
 [OnFrame]
 [ActionReplay]
 [Gecko]
diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/User/GameConfig/SPDE52.ini
new file mode 100644
index 0000000000..e9698d8952
--- /dev/null
+++ b/Data/User/GameConfig/SPDE52.ini
@@ -0,0 +1,20 @@
+# SPDE52 - Spider-Man™: SD
+[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 LLE audio for sound ingame. Graphic glitches.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 1
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 0.7
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Video_Enhancements]
+MaxAnisotropy = 0
diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/User/GameConfig/SPDP52.ini
new file mode 100644
index 0000000000..0a19aeb06b
--- /dev/null
+++ b/Data/User/GameConfig/SPDP52.ini
@@ -0,0 +1,20 @@
+# SPDP52 - Spider-Man™: SD
+[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 LLE audio for sound ingame. Graphic glitches.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 1
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 0.7
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Video_Enhancements]
+MaxAnisotropy = 0

From c0498ca8314e9c7cce319eae4c006a7f459e3851 Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Sun, 16 Oct 2011 16:26:43 +1100
Subject: [PATCH 2/2] Synchronised the JIT cache with the ICache by
 invalidating the JIT block when the ICache is updated.  This fixes Mario &
 Sonic at the Olympic Winter Games.  Thanks to DimitriPilot3 for the tip.

Fixes issue 1610.
---
 Source/Core/Core/Src/PowerPC/PPCCache.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
index 33ecc0ee88..540d4940f7 100644
--- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
@@ -134,6 +134,8 @@ namespace PowerPC
 #endif
 		if (t == 0xff) // load to the cache
 		{
+			if (jit)
+				jit->GetBlockCache()->InvalidateICache(addr);
 			if (HID0.ILOCK) // instruction cache is locked
 				return Memory::ReadUnchecked_U32(addr);
 			// select a way