Merge branch 'master' into GLSL-master

Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp

CMakeLists.txt

@@ -106,9 +106,22 @@ 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)
@@ -258,13 +271,18 @@ if(USE_EGL)
 endif()
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
+option(ANDROID "Enables a build for Android" OFF)
+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)
@@ -376,6 +394,7 @@ else()
 		set(PORTAUDIO_FOUND FALSE)
 	endif(PORTAUDIO)
 
+	option(OPROFILING "Enable profiling" OFF)
 	if(OPROFILING)
 		check_lib(OPROFILE opagent opagent.h)
 		check_lib(BFD bfd bfd.h)
@@ -386,7 +405,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)
 #
@@ -401,7 +420,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
 #
@@ -415,7 +433,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)
@@ -440,6 +458,7 @@ if(OPENAL_FOUND)
 	endif()
 endif()
 
+if(NOT ANDROID)
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		include(FindSDL2 OPTIONAL)
 	endif()
@@ -461,11 +480,12 @@ else(SDL2_FOUND)
 		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
@@ -476,7 +496,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)
@@ -506,6 +526,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()
@@ -515,8 +536,9 @@ else()
 			include_directories(Externals/GLew/include)
 		endif(NOT GLEW_FOUND)
 	endif()
+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()
@@ -524,10 +546,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}"
@@ -599,7 +636,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)
 
 
 ########################################
@@ -674,4 +711,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/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

@@ -43,7 +43,4 @@ $All Vehicles Unlocked
 840030C8 FFDC6F00
 [Gecko]
 [Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-EFBCopyCacheEnable = True
 [Video_Settings]

Data/User/GameConfig/GFZP01.ini

@@ -24,7 +24,4 @@ $Make Save Copyable
 04C3110C 4B400410
 [Gecko]
 [Video_Hacks]
-EFBCopyEnable = True
-EFBToTextureEnable = False
-EFBCopyCacheEnable = True
 [Video_Settings]

Data/User/GameConfig/GOSE41.ini

@@ -1,9 +1,11 @@
 # GOSE41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+FastDiscSpeed = 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,11 @@
 # GOSP41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+FastDiscSpeed = 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,11 @@
 # GOSX41 - Open Season
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 1
+MMU = 1
+FastDiscSpeed = 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/PH_PRESETS.ini

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

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/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/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/RTZE08.ini

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

Data/User/GameConfig/RTZJ08.ini

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

Data/User/GameConfig/RTZK08.ini

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

Data/User/GameConfig/RTZP08.ini

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

Data/User/GameConfig/RZJD69.ini

@@ -18,4 +18,3 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RZJE69.ini

@@ -18,4 +18,3 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RZJJ13.ini

@@ -18,4 +18,3 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/RZJP69.ini

@@ -32,5 +32,4 @@ $Rapid Fire [TNTkryzt]
 SafeTextureCacheColorSamples = 512
 [Video_Enhancements]
 [Wii]
-DisableWiimoteSpeaker = 1
 

Data/User/GameConfig/RZZE8P.ini

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

Data/User/GameConfig/RZZJEL.ini

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

Data/User/GameConfig/RZZP8P.ini

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

Data/User/GameConfig/SC2E8P.ini

@@ -18,4 +18,3 @@ EmulationIssues =
 DlistCachingEnable = False
 [Video_Settings]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SC2P8P.ini

@@ -67,4 +67,3 @@ $Profile Three Name Changer Jedi Hack & [Mitch]
 DlistCachingEnable = False
 [Video_Settings]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SD2E41.ini

@@ -17,4 +17,3 @@ EmulationIssues =
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SD2J01.ini

@@ -17,4 +17,3 @@ EmulationIssues =
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SD2P41.ini

@@ -17,4 +17,3 @@ EmulationIssues =
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SD2Y41.ini

@@ -17,4 +17,3 @@ EmulationIssues =
 [ActionReplay]
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SEME4Q.ini

@@ -21,4 +21,3 @@ ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SEMJ01.ini

@@ -21,4 +21,3 @@ ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SEMP4Q.ini

@@ -21,4 +21,3 @@ ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SEMX4Q.ini

@@ -21,4 +21,3 @@ ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SEMY4Q.ini

@@ -21,4 +21,3 @@ ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SEMZ4Q.ini

@@ -21,4 +21,3 @@ ForceFiltering = False
 [Video_Hacks]
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SERE4Q.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 EFBScale = 1
 SafeTextureCacheColorSamples = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SERF4Q.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 EFBScale = 1
 SafeTextureCacheColorSamples = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SERP4Q.ini

@@ -17,4 +17,3 @@ PH_ZFar =
 EFBScale = 1
 SafeTextureCacheColorSamples = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SF8E01.ini

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

Data/User/GameConfig/SF8J01.ini

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

Data/User/GameConfig/SF8P01.ini

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

Data/User/GameConfig/SFIE01.ini

@@ -6,7 +6,6 @@ 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.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

Data/User/GameConfig/SFIP01.ini

@@ -6,7 +6,6 @@ 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.
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

Data/User/GameConfig/SHLPA4.ini

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

Data/User/GameConfig/SJDE41.ini

@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [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/SJDP41.ini

@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [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/SJDY41.ini

@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [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/SJDZ41.ini

@@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
 [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/SMOE41.ini

@@ -18,4 +18,3 @@ EFBEmulateFormatChanges = True
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SMOP41.ini

@@ -18,4 +18,3 @@ EFBEmulateFormatChanges = True
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SMOX41.ini

@@ -18,4 +18,3 @@ EFBEmulateFormatChanges = True
 [Video_Enhancements]
 MaxAnisotropy = 0
 [Wii]
-DisableWiimoteSpeaker = 1

Data/User/GameConfig/SO3EE9.ini

@@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches.
 [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/SO3J99.ini

@@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches.
 [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/SOJE41.ini

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

Data/User/GameConfig/SOJP41.ini

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

Data/User/GameConfig/SOUE01.ini

@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]

Data/User/GameConfig/SOUJ01.ini

@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]

Data/User/GameConfig/SOUK01.ini

@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]

Data/User/GameConfig/SOUP01.ini

@@ -17,5 +17,4 @@ PH_ZFar =
 EFBAccessEnable = True
 DlistCachingEnable = False
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Settings]

Data/User/GameConfig/SRQE41.ini

@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/SRQP41.ini

@@ -14,6 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Wii]
-DisableWiimoteSpeaker = 1
 [Video_Hacks]
 DlistCachingEnable = False

Data/User/GameConfig/SX3J01.ini

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

Data/User/GameConfig/SX3P01.ini

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