Merge 'master' into shader-uids-awesome.

Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h

.gitignore

@@ -36,3 +36,6 @@ Source/Core/Common/Src/scmrev.h
 .sconsign.dblite
 Externals/scons-local/*
 .DS_Store
+*~
+#Ignore transifix configuration directory
+.tx

CMakeLists.txt

@@ -3,7 +3,9 @@
 #
 cmake_minimum_required(VERSION 2.6)
 
-option(USE_GLES "Enables GLES, disables OGL" OFF)
+option(ANDROID "Enables a build for Android" OFF)
+option(USE_EGL "Enables EGL OpenGL Interface" OFF)
+option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 
 option(FASTLOG "Enable all logs" OFF)
@@ -105,37 +107,58 @@ if(DOLPHIN_IS_STABLE)
 else()
 	set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
 endif()
+message(${CMAKE_SYSTEM_PROCESSOR})
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
+	set(_M_GENERIC 1)
+	set(_M_ARM 1)
+	add_definitions(-marm -march=armv7-a)
+	add_definitions(-D_M_ARM=1)
+	add_definitions(-D_M_GENERIC=1)
+endif()
 
+# Set these next two lines to test generic
+#set(_M_GENERIC 1)
+#add_definitions(-D_M_GENERIC=1)
 # Various compile flags
+if(NOT _M_GENERIC)
 	add_definitions(-msse2)
+endif()
+
+include(CheckCXXCompilerFlag)
+macro(check_and_add_flag var flag)
+	CHECK_CXX_COMPILER_FLAG(${flag} FLAG_${var})
+	if(FLAG_${var})
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+	endif()
+endmacro()
 
 # Enabling all warnings in MSVC spams too much
 if(NOT MSVC)
 	add_definitions(-Wall)
+
+	# TODO: would like these but they produce overwhelming amounts of warnings
+	#check_and_add_flag(EXTRA -Wextra)
+	#check_and_add_flag(MISSING_FIELD_INITIALIZERS -Wmissing-field-initializers)
+	#check_and_add_flag(SWITCH_DEFAULT -Wswitch-default)
+	#check_and_add_flag(FLOAT_EQUAL -Wfloat-equal)
+	#check_and_add_flag(CONVERSION -Wconversion)
+	#check_and_add_flag(ZERO_AS_NULL_POINTER_CONSTANT -Wzero-as-null-pointer-constant)
+	check_and_add_flag(TYPE_LIMITS -Wtype-limits)
+	check_and_add_flag(SIGN_COMPARE -Wsign-compare)
+	check_and_add_flag(IGNORED_QUALIFIERS -Wignored-qualifiers)
+	check_and_add_flag(UNINITIALIZED -Wuninitialized)
+	check_and_add_flag(LOGICAL_OP -Wlogical-op)
+	check_and_add_flag(SHADOW -Wshadow)
+	check_and_add_flag(INIT_SELF -Winit-self)
 endif(NOT MSVC)
 
 # gcc uses some optimizations which might break stuff without this flag
-add_definitions(-fno-strict-aliasing -fno-exceptions -Wno-psabi)
+add_definitions(-fno-strict-aliasing -fno-exceptions)
 
-include(CheckCXXCompilerFlag)
+check_and_add_flag(VISIBILITY_INLINES_HIDDEN -fvisibility-inlines-hidden)
-
-# We call fread numerous times without checking return values.  Hide the
-# corresponding compiler warnings if the compiler supports doing so.
-CHECK_CXX_COMPILER_FLAG(-Wunused-result NO_UNUSED_RESULT)
-if(NO_UNUSED_RESULT)
-	add_definitions(-Wno-unused-result)
-endif(NO_UNUSED_RESULT)
-
-CHECK_CXX_COMPILER_FLAG(-fvisibility-inlines-hidden VISIBILITY_INLINES_HIDDEN)
-if(VISIBILITY_INLINES_HIDDEN)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-endif(VISIBILITY_INLINES_HIDDEN)
 
 if(UNIX AND NOT APPLE)
-	CHECK_CXX_COMPILER_FLAG(-fvisibility=hidden VISIBILITY_HIDDEN)
+	check_and_add_flag(VISIBILITY_HIDDEN -fvisibility=hidden)
-	if(VISIBILITY_HIDDEN)
-		add_definitions(-fvisibility=hidden)
-	endif(VISIBILITY_HIDDEN)
 endif()
 
 if(APPLE)
@@ -151,8 +174,8 @@ if(APPLE)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
 
 	# Identify the target system:
-	# Ask for 32/64-bit fat binary.
+	# Ask for 64-bit binary.
-	set(TARGET_FLAGS "-arch x86_64 -arch i386")
+	set(TARGET_FLAGS "-arch x86_64")
 	# Minimum OS X version.
 	# This is inserted into the Info.plist as well.
 	# Note that the SDK determines the maximum version of which optional
@@ -174,8 +197,6 @@ if(APPLE)
 	# This avoids a warning when linking with QuickTime.
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_arch_warnings")
 	# Specify target CPUs.
-	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -msse3")
-	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_i386 -march=prescott")
 	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -mssse3")
 	set(TARGET_FLAGS "${TARGET_FLAGS} -Xarch_x86_64 -march=core2")
 	# Target flags apply to both C and C++ compilation.
@@ -238,19 +259,28 @@ endif()
 # Enabling GLES also disables the OpenGL plugin.
 if(USE_GLES)
 	message("GLES rendering enabled")
-	add_definitions(-DUSE_GLES)
+	add_definitions(-DUSE_GLES=1)
-	add_definitions(-DUSE_EGL)
+	add_definitions(-DUSE_EGL=1)
 	set(USE_EGL True)
 endif()
+
+if(USE_EGL)
+	message("EGL OpenGL interface enabled")
+	add_definitions(-DUSE_EGL=1)
+endif()
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
+if(ANDROID)
+	message("Building for Android")
+	add_definitions(-DANDROID)
+endif()
 ########################################
 # Dependency checking
 #
 # TODO: We should have options for dependencies included in the externals to
 # override autodetection of system libraries and force the usage of the
 # externals.
-
+if(NOT ANDROID)
 	include(CheckLib)
 
 	include(FindOpenGL)
@@ -372,7 +402,7 @@ if(OPROFILING)
 			message(FATAL_ERROR "oprofile or bfd not found. Can't build profiling support.")
 		endif()
 	endif()
-
+endif()
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
@@ -387,7 +417,6 @@ include_directories(Source/Core/InputCommon/Src)
 include_directories(Source/Core/VideoCommon/Src)
 include_directories(Source/Core/VideoUICommon/Src)
 
-
 ########################################
 # Process externals and setup their include directories
 #
@@ -401,7 +430,7 @@ include_directories(Source/Core/VideoUICommon/Src)
 add_subdirectory(Externals/Bochs_disasm)
 include_directories(Externals/Bochs_disasm)
 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
 endif()
 if(LZO_FOUND)
@@ -426,6 +455,7 @@ if(OPENAL_FOUND)
 	endif()
 endif()
 
+if(NOT ANDROID)
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		include(FindSDL2 OPTIONAL)
 	endif()
@@ -443,15 +473,16 @@ else(SDL2_FOUND)
 	else(SDL_FOUND)
 		# TODO: Use the prebuilt one on Windows
 		message("Using static SDL from Externals")
-		include_directories(Externals/SDL Externals/SDL/include)
+		include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
 		add_subdirectory(Externals/SDL)
 	endif(SDL_FOUND)
 	endif(SDL2_FOUND)
+endif()
 
 set(SFML_FIND_VERSION TRUE)
 set(SFML_FIND_VERSION_MAJOR 1)
 set(SFML_FIND_VERSION_MINOR 5)
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	include(FindSFML OPTIONAL)
 endif()
 if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
@@ -462,7 +493,7 @@ else()
        include_directories(Externals/SFML/include)
 endif()
 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
 endif()
 if(SOIL_FOUND)
@@ -492,6 +523,7 @@ if(WIN32)
 	find_library(GLEW glew32s PATHS Externals/GLew)
 	include_directories(Externals/GLew/include)
 else()
+	if(NOT ANDROID)
 		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 			check_lib(GLEW GLEW GL/glew.h)
 		endif()
@@ -500,18 +532,10 @@ else()
 			add_subdirectory(Externals/GLew)
 			include_directories(Externals/GLew/include)
 		endif(NOT GLEW_FOUND)
-
-	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		check_lib(CG Cg Cg/cg.h)
 	endif()
-	if(NOT CG_FOUND)
-		message("Using static Cg from Externals")
-		include_directories(Externals)
-	endif(NOT CG_FOUND)
-	check_lib(CGGL CgGL Cg/cgGL.h)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	find_library(CL OpenCL)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
 else()
@@ -519,10 +543,25 @@ else()
 	add_subdirectory(Externals/CLRun)
 endif()
 
-if(NOT DISABLE_WX)
+if(NOT DISABLE_WX AND NOT ANDROID)
 	include(FindwxWidgets OPTIONAL)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
 
+	if(wxWidgets_FOUND)
+		EXECUTE_PROCESS(
+			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+				${wxWidgets_CONFIG_OPTIONS} --version
+			OUTPUT_VARIABLE wxWidgets_VERSION
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			ERROR_QUIET
+			)
+		message("Found wxWidgets version ${wxWidgets_VERSION}")
+		if(${wxWidgets_VERSION} VERSION_LESS "2.8.9")
+			message("At least 2.8.9 is required; ignoring found version")
+			unset(wxWidgets_FOUND)
+		endif()
+	endif(wxWidgets_FOUND)
+		
 	if(wxWidgets_FOUND)
 		EXECUTE_PROCESS(
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
@@ -594,7 +633,7 @@ if(NOT DISABLE_WX)
 		set(wxWidgets_LIBRARIES "wx")
 	endif(wxWidgets_FOUND)
 	add_definitions(-DHAVE_WX=1)
-endif(NOT DISABLE_WX)
+endif(NOT DISABLE_WX AND NOT ANDROID)
 
 
 ########################################
@@ -614,6 +653,7 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h
 	)
 include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
 
+
 ########################################
 # Start compiling our code
 #
@@ -668,4 +708,4 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}")
 
 # CPack must be included after the CPACK_* variables are set in order for those
 # variables to take effect.
-include(CPack)
+Include(CPack)

Data/User/GameConfig/GAFE01.ini

@@ -319,4 +319,4 @@ PH_ZFar =
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 [Core]
-FastDiscSpeed = 1
+

Data/User/GameConfig/GAFJ01.ini

@@ -16,4 +16,4 @@ PH_ZFar =
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 [Core]
-FastDiscSpeed = 1
+

Data/User/GameConfig/GAFP01.ini

@@ -16,4 +16,4 @@ PH_ZFar =
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 [Core]
-FastDiscSpeed = 1
+

Data/User/GameConfig/GAFU01.ini

@@ -16,4 +16,4 @@ PH_ZFar =
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 [Core]
-FastDiscSpeed = 1
+

Data/User/GameConfig/GF8E69.ini

@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = The videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 $Master Code
@@ -40,3 +40,9 @@ $Away Team Never Scores
 00416F8C 00000000
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GF8P69.ini

@@ -0,0 +1,16 @@
+# GF8P69 - FIFA Street
+[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 = The videos are messed up, skip them.
+[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]

Data/User/GameConfig/GFZE01.ini

@@ -2,10 +2,10 @@
 [Core] Values set here will override the main dolphin settings.
 EnableFPRF = True
 TLBHack = 1
-CPUThread = 0
+SyncGPU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows.
+EmulationIssues = Needs Synchronize GPU thread for stability.
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
 ProjectionHack = 1
@@ -43,7 +43,4 @@ $All Vehicles Unlocked
 840030C8 FFDC6F00
 [Gecko]
 [Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-EFBCopyCacheEnable = True
 [Video_Settings]

Data/User/GameConfig/GFZJ01.ini

@@ -0,0 +1,26 @@
+# GFZJ01 - F-ZERO GX 
+[Core] Values set here will override the main dolphin settings.
+EnableFPRF = True
+TLBHack = 1
+SyncGPU = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Synchronize GPU thread for stability.
+[OnFrame] Add memory patches to be applied every frame here.
+[Video]
+ProjectionHack = 1
+PH_SZNear = 1
+PH_SZFar = 1
+PH_ExtraParam = 0
+PH_ZNear = 20
+PH_ZFar = 1.7555555
+[ActionReplay]
+$Make Save Copyable
+0C031514 909C0028
+04031518 48BFFBE8
+04C31100 38000004
+04C31104 981C0034
+04C31108 38000000
+04C3110C 4B400410
+[Gecko]
+

Data/User/GameConfig/GFZP01.ini

@@ -2,10 +2,10 @@
 [Core] Values set here will override the main dolphin settings.
 EnableFPRF = True
 TLBHack = 1
-CPUThread = 0
+SyncGPU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Dual core is very unstable/doesn't even boot with most video plugins. Efb to ram is needed for proper shadows.
+EmulationIssues = Needs Synchronize GPU thread for stability.
 [OnFrame] Add memory patches to be applied every frame here.
 [Video]
 ProjectionHack = 1
@@ -24,7 +24,4 @@ $Make Save Copyable
 04C3110C 4B400410
 [Gecko]
 [Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-EFBCopyCacheEnable = True
 [Video_Settings]

Data/User/GameConfig/GGZE52.ini

@@ -1,10 +1,9 @@
 # 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)
+EmulationIssues = GFX glitches.
-EmulationStateId = 3
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video_Hacks]

Data/User/GameConfig/GGZX52.ini

@@ -1,10 +1,9 @@
 # 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)
+EmulationIssues = GFX glitches.
-EmulationStateId = 3
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video_Hacks]

Data/User/GameConfig/GJXE51.ini

@@ -15,4 +15,4 @@ EmulationIssues = Slow,needs mmu and lle audio plugin for proper audio(r7411).
 [Video_Settings]
 [Core]
 MMU = 1
-FastDiscSpeed = 1
+

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 = 

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 = 

Data/User/GameConfig/GLSD64.ini

@@ -0,0 +1,20 @@
+# GLSD64 - 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 = 4
+EmulationIssues = Needs Real Xfb for the 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

Data/User/GameConfig/GLSE64.ini

@@ -1,9 +1,10 @@
 # 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 = 
+EmulationIssues = Needs Real Xfb for the videos to display.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -14,3 +15,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GLSF64.ini

@@ -0,0 +1,20 @@
+# GLSF64 - 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 = 4
+EmulationIssues = Needs Real Xfb for the 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

Data/User/GameConfig/GLSP64.ini

@@ -0,0 +1,20 @@
+# GLSP64 - 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 = 4
+EmulationIssues = Needs Real Xfb for the 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

Data/User/GameConfig/GM4E01.ini

@@ -127,3 +127,5 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Core]
+VBeam = 1

Data/User/GameConfig/GM4J01.ini

@@ -0,0 +1,17 @@
+# GM4J01 - Mario Kart: Double Dash!!  
+[EmuState]
+#The Emulation State.
+EmulationStateId = 4
+EmulationIssues = Needs LLE audio to prevent BGM from stopping. Disable "emulate format changes" to increase the game speed.
+[OnFrame] 
+[ActionReplay] 
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Core]
+VBeam = 1

Data/User/GameConfig/GM4P01.ini

@@ -138,3 +138,5 @@ $Goraud Shading
 040A9714 4E800020
 [Video]
 ProjectionHack = 0
+[Core]
+VBeam = 1

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
+EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = Enable the GameCube BIOS to allow the game to boot.
 [OnFrame]
 +$Nop Hack
 0x80025BA0:dword:0x60000000

Data/User/GameConfig/GNOE78.ini

@@ -1,7 +1,6 @@
 # GNOE78 - Nicktoons Unite!
 [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.
 EmulationStateId = 4
 EmulationIssues = 

Data/User/GameConfig/GOSE41.ini

@@ -1,9 +1,10 @@
 # GOSE41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
+EmulationStateId = 4
-EmulationIssues = Severe graphic issues.
+EmulationIssues = Needs MMU (Slow).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GOSP41.ini

@@ -1,9 +1,10 @@
 # GOSP41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
+EmulationStateId = 4
-EmulationIssues = Severe graphic issues.
+EmulationIssues = Needs MMU (Slow).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GOSX41.ini

@@ -1,9 +1,10 @@
 # GOSX41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+BlockMerging = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
+EmulationStateId = 4
-EmulationIssues = Severe graphic issues.
+EmulationIssues = Needs MMU (Slow).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GSSE8P.ini

@@ -1,8 +1,8 @@
 # GSSE8P - Sega Soccer Slam
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 0
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 $Master Code
@@ -19,3 +19,14 @@ $SubZero Have Tons Of Cash
 0423C204 05F5E0FF
 $Volta Have Tons Of Cash
 0423CEA8 05F5E0FF
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GSSJ8P.ini

@@ -0,0 +1,18 @@
+# GSSJ8P - Sega Soccer Slam
+[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 = Needs real xfb for the videos to display.
+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]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GSSP70.ini

@@ -0,0 +1,18 @@
+# GSSP70 - Sega Soccer Slam
+[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 = Needs real xfb for the videos to display.
+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]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GSSP8P.ini

@@ -0,0 +1,18 @@
+# GSSP8P - Sega Soccer Slam
+[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 = Needs real xfb for the videos to display.
+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]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

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]

Data/User/GameConfig/GWAE8P.ini

@@ -1,6 +1,5 @@
 # GWAE8P - Spartan: Total Warrior
 [Core] Values set here will override the main dolphin settings.
-FastDiscSpeed = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 0
 EmulationIssues = 

Data/User/GameConfig/GWAF8P.ini

@@ -1,6 +1,5 @@
 # GWAF8P - Spartan: Total Warrior
 [Core] Values set here will override the main dolphin settings.
-FastDiscSpeed = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 0
 EmulationIssues = 

Data/User/GameConfig/GWAP8P.ini

@@ -1,6 +1,5 @@
 # GWAP8P - Spartan : Total  Warrior (TM)
 [Core] Values set here will override the main dolphin settings.
-FastDiscSpeed = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 0
 EmulationIssues = 

Data/User/GameConfig/GWKE41.ini

@@ -0,0 +1,16 @@
+# GWKE41 - King Kong
+[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]

Data/User/GameConfig/GWLE6L.ini

@@ -0,0 +1,18 @@
+# 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 = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
++$Bypass FIFO reset
+0x8028EF00:dword:0x48000638
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

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

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

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]

Data/User/GameConfig/GZPE70.ini

@@ -0,0 +1,18 @@
+# GZPE70 - Zapper
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[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

Data/User/GameConfig/GZPP70.ini

@@ -0,0 +1,18 @@
+# GZPP70 - Zapper
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[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

Data/User/GameConfig/PH_PRESETS.ini

@@ -33,8 +33,7 @@ PH_ExtraParam = 1
 
 [5]
 Title = Tales of Symphonia GC
-PH_ZNear = 0.5
+PH_ZNear = 0.00026
-PH_ZFar = 1
 
 
 # ---------------------------------------------------

Data/User/GameConfig/R22E01.ini

@@ -18,4 +18,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R22J01.ini

@@ -18,4 +18,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R22P01.ini

@@ -18,4 +18,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R3ME01.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R3MP01.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R4QE01.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R4QJ01.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R4QK01.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R4QP01.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R5WEA4.ini

@@ -16,4 +16,3 @@ PH_ZFar =
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R5WJA4.ini

@@ -16,4 +16,3 @@ PH_ZFar =
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R7PE01.ini

@@ -16,4 +16,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/R7PP01.ini

@@ -10,4 +10,3 @@ EmulationStateId = 5
 [Video]
 ProjectionHack = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RBWE01.ini

@@ -15,4 +15,3 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RBWJ01.ini

@@ -15,4 +15,3 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RBWP01.ini

@@ -15,4 +15,3 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RCJE8P.ini

@@ -24,6 +24,5 @@ PH_ZFar =
 [Video_Enhancements]
 ForceFiltering = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/RCJP8P.ini

@@ -18,6 +18,5 @@ PH_ZFar =
 [Video_Enhancements]
 ForceFiltering = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/RD2E41.ini

@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RD2J41.ini

@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RD2K41.ini

@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RD2P41.ini

@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RD2X41.ini

@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RFEE01.ini

@@ -1,7 +1,7 @@
 # RFEE01 - FIRE EMBLEM 10 USA
 [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 = Disable gamecube controller or wiimote to not have conflicts. Fog appears black ingame in recent builds(issue 4475).
+EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -15,4 +15,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-DisableFog = True

Data/User/GameConfig/RFEJ01.ini

@@ -1,7 +1,7 @@
 # RFEJ01 - Fire Emblem Akatsuki No Megami
 [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 = Disable gamecube controller or wiimote to not have conflicts. Fog appears black ingame in recent builds(issue 4475).
+EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -15,4 +15,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-DisableFog = True

Data/User/GameConfig/RFEP01.ini

@@ -3,7 +3,7 @@
 [Speedhacks]
 0x80006e00=800
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Disable gamecube controller or wiimote to not have conflicts. Fog appears black ingame in recent builds(issue 4475).
+EmulationIssues = Disable gamecube controller or wiimote to not have conflicts.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -17,4 +17,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Settings]
-DisableFog = True

Data/User/GameConfig/RH8E4F.ini

@@ -0,0 +1,18 @@
+# RH8E4F - Tomb Raider Underworld
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+[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

Data/User/GameConfig/RH8JEL.ini

@@ -0,0 +1,18 @@
+# RH8JEL - Tomb Raider Underworld
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+[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

Data/User/GameConfig/RH8P4F.ini

@@ -1,9 +1,18 @@
-# RH8P4F - Tomb Raider Eight
+# RH8P4F - Tomb Raider Underworld
 [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 real Xfb for the 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

Data/User/GameConfig/RH8X4F.ini

@@ -0,0 +1,18 @@
+# RH8X4F - Tomb Raider Underworld
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+[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

Data/User/GameConfig/RHDE8P.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RHDJ8P.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RHDP8P.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RHOE8P.ini

@@ -36,4 +36,3 @@ C2152674 00000002
 3CA03B9B 38A5C9FF
 90B60178 00000000
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RHOJ8P.ini

@@ -9,4 +9,3 @@ EmulationIssues = Use dx11 plugin (r6945)
 ProjectionHack = 0
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RHOP8P.ini

@@ -9,4 +9,3 @@ EmulationIssues = Use dx11 plugin (r6945)
 ProjectionHack = 0
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RLGE64.ini

@@ -6,7 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

Data/User/GameConfig/RLGJ52.ini

@@ -6,7 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

Data/User/GameConfig/RLGP64.ini

@@ -6,7 +6,6 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

Data/User/GameConfig/RM3E01.ini

@@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 EFBEmulateFormatChanges = True

Data/User/GameConfig/RM3J01.ini

@@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 EFBEmulateFormatChanges = True

Data/User/GameConfig/RM3P01.ini

@@ -23,6 +23,5 @@ SafeTextureCacheColorSamples = 512
 EFBToTextureEnable = False
 EFBCopyEnable = True
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 EFBEmulateFormatChanges = True

Data/User/GameConfig/RQREXJ.ini

@@ -17,4 +17,3 @@ EmulationIssues = Needs single core to run properly(r7436).
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RQRJAF.ini

@@ -17,4 +17,3 @@ EmulationIssues = Needs single core to run properly(r7436).
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RQRPAF.ini

@@ -17,4 +17,3 @@ EmulationIssues = Needs single core to run properly(r7436).
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RRBE41.ini

@@ -1,9 +1,9 @@
 # RRBE41 - Rayman Raving Rabbids
 [Core] Values set here will override the main dolphin settings.
-CPUThread = 0
+SyncGPU = 1
 [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)
+EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/RRBJ41.ini

@@ -1,9 +1,9 @@
 # RRBJ41 - Rayman Raving Rabbids
 [Core] Values set here will override the main dolphin settings.
-CPUThread = 0
+SyncGPU = 1
 [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)
+EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/RRBP41.ini

@@ -1,9 +1,9 @@
 # RRBP41 - Rayman Raving Rabbids
 [Core] Values set here will override the main dolphin settings.
-CPUThread = 0
+SyncGPU = 1
 [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)
+EmulationIssues = Needs Synchronise GPU thread for stability. Use direct3d11 for less glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/RRKE70.ini

@@ -17,4 +17,3 @@ EmulationIssues =
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RRKP70.ini

@@ -17,4 +17,3 @@ EmulationIssues =
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RS5EC8.ini

@@ -0,0 +1,17 @@
+# RS5EC8 - SAMURAI WARRIORS KATANA
+[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_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/RS5JC8.ini

@@ -0,0 +1,17 @@
+# RS5JC8 - Sengoku Musou KATANA
+[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_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/RS5PC8.ini

@@ -0,0 +1,17 @@
+# RS5PC8 - SAMURAI WARRIORS KATANA
+[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_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/RTZE08.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 UseXFB = True
 UseRealXFB = False
 [Wii]
-DisableWiimoteSpeaker = 1