Merge branch 'master' into GLSL-master

Conflicts:
	.gitignore

9 files changed, 33 insertions, 6 deletions

diff --git a/Data/User/GameConfig/GKBEAF.ini b/Data/User/GameConfig/GKBEAF.ini
index 9934a2ba80..5e7ee300f9 100644
--- a/Data/User/GameConfig/GKBEAF.ini
+++ b/Data/User/GameConfig/GKBEAF.ini
@@ -1,5 +1,6 @@
 # GKBEAF - Baten Kaitos
 [Core] Values set here will override the main dolphin settings.
+SyncGPU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
 EmulationIssues = 
diff --git a/Data/User/GameConfig/GKBPAF.ini b/Data/User/GameConfig/GKBPAF.ini
index 936380ca29..afb3661d63 100644
--- a/Data/User/GameConfig/GKBPAF.ini
+++ b/Data/User/GameConfig/GKBPAF.ini
@@ -1,5 +1,6 @@
 # GKBPAF - Baten Kaitos
 [Core] Values set here will override the main dolphin settings.
+SyncGPU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
 EmulationIssues = 
diff --git a/Data/User/GameConfig/GLSE64.ini b/Data/User/GameConfig/GLSE64.ini
index f9b38b357c..70bea42316 100644
--- a/Data/User/GameConfig/GLSE64.ini
+++ b/Data/User/GameConfig/GLSE64.ini
@@ -1,8 +1,9 @@
 # GLSE64 - LucasArts Gladius
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
+SyncGPU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GNHE5d.ini b/Data/User/GameConfig/GNHE5d.ini
index a9ba54d048..a1c2082fde 100644
--- a/Data/User/GameConfig/GNHE5d.ini
+++ b/Data/User/GameConfig/GNHE5d.ini
@@ -3,8 +3,8 @@
 #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
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Enable the GameCube BIOS to allow the game to boot.
 [OnFrame]
 +$Nop Hack
 0x80025BA0:dword:0x60000000
diff --git a/Data/User/GameConfig/GSZP41.ini b/Data/User/GameConfig/GSZP41.ini
new file mode 100644
index 0000000000..e60e164899
--- /dev/null
+++ b/Data/User/GameConfig/GSZP41.ini
@@ -0,0 +1,17 @@
+# GSZP41 - SPEED CHALLENGE - Jacques Villeneuve's Racing Vision
+[Core] Values set here will override the main dolphin settings.
+SyncGPU = 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 = 
+UseBBox = 1
+[Gecko]
diff --git a/Data/User/GameConfig/GWLE6L.ini b/Data/User/GameConfig/GWLE6L.ini
new file mode 100644
index 0000000000..60775fccd0
--- /dev/null
+++ b/Data/User/GameConfig/GWLE6L.ini
@@ -0,0 +1,10 @@
+# GWLE6L - Project Zoo
+[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.
++$Bypass FIFO reset
+0x8028EF00:dword:0x48000638
+[ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/GZ2E01.ini b/Data/User/GameConfig/GZ2E01.ini
index f84b0006e7..e4de22aad5 100644
--- a/Data/User/GameConfig/GZ2E01.ini
+++ b/Data/User/GameConfig/GZ2E01.ini
@@ -1,6 +1,5 @@
 # GZ2E01 - The Legend of Zelda: Twilight Princess
 [Core]
-FastDiscSpeed = 1
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
diff --git a/Data/User/GameConfig/GZ2J01.ini b/Data/User/GameConfig/GZ2J01.ini
index da0b6ceb42..f2f3b3d48f 100644
--- a/Data/User/GameConfig/GZ2J01.ini
+++ b/Data/User/GameConfig/GZ2J01.ini
@@ -1,6 +1,5 @@
 # GZ2J01 - The Legend of Zelda: Twilight Princess
 [Core]
-FastDiscSpeed = 1
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/User/GameConfig/GZ2P01.ini
index 4ed0b6f6ef..bb6c58e20e 100644
--- a/Data/User/GameConfig/GZ2P01.ini
+++ b/Data/User/GameConfig/GZ2P01.ini
@@ -1,7 +1,6 @@
 # GZ2P01 - The Legend of Zelda Twilight Princess
 [Core]
 #Values set here will override the main dolphin settings.
-FastDiscSpeed = 1
 [Speedhacks]
 0x803420bc=200
 [EmuState]