Merge branch 'master' into wii-network

Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

CMakeLists.txt

@@ -7,7 +7,9 @@ option(ANDROID "Enables a build for Android" OFF)
 option(USE_EGL "Enables EGL OpenGL Interface" OFF)
 option(USE_X11 "Enables X11 Support" ON)
 option(USE_WAYLAND "Enables Wayland Support" OFF)
-option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
+option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
+option(USE_GLES3 "Enables GLES3 and EGL" OFF)
+option(USE_UPNP "Enables UPnP port mapping support" ON)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 
 option(FASTLOG "Enable all logs" OFF)
@@ -84,11 +86,11 @@ endfunction(enable_precompiled_headers)
 include(FindGit OPTIONAL)
 if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 	# defines DOLPHIN_WC_REVISION
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
 		OUTPUT_VARIABLE DOLPHIN_WC_REVISION
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 	# defines DOLPHIN_WC_DESCRIBE
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
 		OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 
@@ -96,7 +98,7 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 	STRING(REGEX REPLACE "-[^-]+((-dirty)?)$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
 
 	# defines DOLPHIN_WC_BRANCH
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
 		OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
@@ -120,6 +122,13 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	set(USE_GLES 1)
 endif()
 
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
+	set(_M_GENERIC 1)
+	set(_M_MIPS 1)
+	add_definitions(-D_M_MIPS=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)
@@ -266,20 +275,36 @@ if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
 endif()
 
-
 option(GDBSTUB "Enable gdb stub for remote debugging." OFF)
 if(GDBSTUB)
 	add_definitions(-DUSE_GDBSTUB)
 endif(GDBSTUB)
 
+if(ANDROID)
+	message("Building for Android")
+	add_definitions(-DANDROID)
+	set(USE_X11 0)
+	set(USE_WAYLAND 0)
+	set(USE_UPNP 0)
+	set(USE_GLES3 1)
+endif()
+
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
+if(USE_GLES3)
+	message("GLES3 rendering enabled")
+	add_definitions(-DUSE_GLES=1 -DUSE_EGL=1 -DUSE_GLES3=1)
+	include_directories(Externals/GLES3)
+	set(USE_EGL True)
+	set(USE_GLES True)
+else()
 	if(USE_GLES)
-	message("GLES rendering enabled")
+		message("GLES2 rendering enabled. OpenGL disabled")
 		add_definitions(-DUSE_GLES=1)
 		add_definitions(-DUSE_EGL=1)
 		set(USE_EGL True)
 	endif()
+endif()
 # For now Wayland and EGL are tied to each other.
 # The alternative would be an shm path
 if(USE_WAYLAND)
@@ -297,12 +322,6 @@ else()
 endif()
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
-if(ANDROID)
-	message("Building for Android")
-	add_definitions(-DANDROID)
-	set(USE_X11 0)
-	set(USE_WAYLAND 0)
-endif()
 ########################################
 # Dependency checking
 #
@@ -423,6 +442,13 @@ if(NOT ANDROID)
 		else()
 			add_definitions(-DHAVE_XRANDR=0)
 		endif(XRANDR_FOUND)
+
+		pkg_check_modules(XINPUT2 xi>=1.5.0)
+		if(XINPUT2_FOUND)
+			add_definitions(-DHAVE_X11_XINPUT2=1)
+		else()
+			add_definitions(-DHAVE_X11_XINPUT2=0)
+		endif(XINPUT2_FOUND)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
@@ -564,6 +590,21 @@ else()
 	include_directories(Externals/SFML/include)
 endif()
 
+if(USE_UPNP)
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+		include(FindMiniupnpc)
+	endif()
+	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
+		message("Using shared miniupnpc")
+		include_directories(${MINIUPNP_INCLUDE_DIR})
+	else()
+		message("Using static miniupnpc from Externals")
+		add_subdirectory(Externals/miniupnpc)
+		include_directories(Externals/miniupnpc/src)
+	endif()
+	add_definitions(-DUSE_UPNP)
+endif()
+
 
 message("Using PolarSSL from Externals")
 add_subdirectory(Externals/polarssl/)
@@ -624,22 +665,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
 
 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
-			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}"
 			${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION

CMakeTests/FindMiniupnpc.cmake

@@ -0,0 +1,179 @@
+# Locate miniupnp library
+# This module defines
+#  MINIUPNP_FOUND, if false, do not try to link to miniupnp
+#  MINIUPNP_LIBRARY, the miniupnp variant
+#  MINIUPNP_INCLUDE_DIR, where to find miniupnpc.h and family)
+#  MINIUPNPC_VERSION_PRE1_6 --> set if we detect the version of miniupnpc is
+#                               pre 1.6
+#  MINIUPNPC_VERSION_PRE1_5 --> set if we detect the version of miniupnpc is
+#                               pre 1.5
+#
+# Note that the expected include convention is
+#  #include "miniupnpc.h"
+# and not
+#  #include <miniupnpc/miniupnpc.h>
+# This is because, the miniupnpc location is not standardized and may exist
+# in locations other than miniupnpc/
+
+#=============================================================================
+# Copyright 2011 Mark Vejvoda
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+	# Already in cache, be silent
+	set(MINIUPNP_FIND_QUIETLY TRUE)
+endif (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+
+find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
+	PATH_SUFFIXES miniupnpc)
+find_library(MINIUPNP_LIBRARY miniupnpc)
+
+if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+	set (MINIUPNP_FOUND TRUE)
+endif ()
+
+if (MINIUPNP_FOUND)
+	if (NOT MINIUPNP_FIND_QUIETLY)
+		message (STATUS "Found the miniupnpc libraries at ${MINIUPNP_LIBRARY}")
+		message (STATUS "Found the miniupnpc headers at ${MINIUPNP_INCLUDE_DIR}")
+	endif (NOT MINIUPNP_FIND_QUIETLY)
+
+	message(STATUS "Detecting version of miniupnpc in path: ${MINIUPNP_INCLUDE_DIR}")
+
+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	check_cxx_source_runs("
+	#include <miniwget.h>
+	#include <miniupnpc.h>
+	#include <upnpcommands.h>
+	#include <stdio.h>
+	int main()
+	{
+	static struct UPNPUrls urls;
+	static struct IGDdatas data;
+
+	GetUPNPUrls (&urls, &data, \"myurl\",0);
+
+	return 0;
+	}"
+	MINIUPNPC_VERSION_1_7_OR_HIGHER)
+
+IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	check_cxx_source_runs("
+	#include <miniwget.h>
+	#include <miniupnpc.h>
+	#include <upnpcommands.h>
+	#include <stdio.h>
+	int main()
+	{
+	struct UPNPDev *devlist = NULL;
+	int upnp_delay = 5000;
+	const char *upnp_multicastif = NULL;
+	const char *upnp_minissdpdsock = NULL;
+	int upnp_sameport = 0;
+	int upnp_ipv6 = 0;
+	int upnp_error = 0;
+	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+
+	return 0;
+	}"
+	MINIUPNPC_VERSION_PRE1_7)
+   ENDIF()
+
+   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	   check_cxx_source_runs("
+	   #include <miniwget.h>
+	   #include <miniupnpc.h>
+	   #include <upnpcommands.h>
+	   #include <stdio.h>
+	   int main()
+	   {
+	   struct UPNPDev *devlist = NULL;
+	   int upnp_delay = 5000;
+	   const char *upnp_multicastif = NULL;
+	   const char *upnp_minissdpdsock = NULL;
+	   int upnp_sameport = 0;
+	   int upnp_ipv6 = 0;
+	   int upnp_error = 0;
+	   devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport);
+
+	   return 0;
+	   }"
+	   MINIUPNPC_VERSION_PRE1_6)
+
+   ENDIF()
+
+   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	   check_cxx_source_runs("
+	   #include <miniwget.h>
+	   #include <miniupnpc.h>
+	   #include <upnpcommands.h>
+	   #include <stdio.h>
+	   static struct UPNPUrls urls;
+	   static struct IGDdatas data;
+	   int main()
+	   {
+	   char externalIP[16]     = "";
+	   UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
+
+	   return 0;
+	   }"
+	   MINIUPNPC_VERSION_1_5_OR_HIGHER)
+	ENDIF()
+
+	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+		set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+		set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+		check_cxx_source_runs("
+		#include <miniwget.h>
+		#include <miniupnpc.h>
+		#include <upnpcommands.h>
+		#include <stdio.h>
+		static struct UPNPUrls urls;
+		static struct IGDdatas data;
+		int main()
+		{
+		char externalIP[16]     = "";
+		UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
+
+		return 0;
+		}"
+		MINIUPNPC_VERSION_PRE1_5)
+
+ENDIF()
+
+IF(MINIUPNPC_VERSION_PRE1_5)
+	message(STATUS "Found miniupnpc version is pre v1.5")
+ENDIF()
+IF(MINIUPNPC_VERSION_PRE1_6)
+	message(STATUS "Found miniupnpc version is pre v1.6")
+ENDIF()
+IF(MINIUPNPC_VERSION_PRE1_7)
+	message(STATUS "Found miniupnpc version is pre v1.7")
+ENDIF()
+
+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
+	message(STATUS "Found miniupnpc version is v1.7 or higher")
+ENDIF()
+
+else ()
+	message (STATUS "Could not find miniupnp")
+endif ()
+
+MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY)
+

Data/User/GameConfig/G2FE78.ini

@@ -5,8 +5,6 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C43213D8 0000FF01
 $Infinite Health
 04112828 48232224
 04344A4C D017021C

Data/User/GameConfig/G2ME01.ini

@@ -7,13 +7,6 @@ EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
 0x803758bc=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C4354E70 0000FF01
-C436F000 0000FF02
-4D30294C 4E800020
-C530294C 0000FF03
-0441FD80 00000000
-C6004010 000000FF
 $This Code Must Be On!
 043BC410 906D0000
 043BC414 88030004

Data/User/GameConfig/G2MP01.ini

@@ -8,11 +8,6 @@ EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C43552C8 0000FF01
-C436F41C 0000FF02
-0D30294C 4E800020
-C530294C 0000FF03
 $Infinite Health
 423DDE0C 000A44BB
 423DDE0C 000B6000

Data/User/GameConfig/G3FE69.ini

@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]
 SafeTextureCacheColorSamples = 0

Data/User/GameConfig/G3FF69.ini

@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]
 SafeTextureCacheColorSamples = 0

Data/User/GameConfig/G3FP69.ini

@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]
 SafeTextureCacheColorSamples = 0

Data/User/GameConfig/G4GEE9.ini

@@ -10,10 +10,6 @@ EmulationStateId = 2
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(M) 
-06C2E568 88000000
-C41D3578 0000FF01
-
 $Infinite Money 
 06C2E569 08000000
 050943A8 0098967F

Data/User/GameConfig/G4NJDA.ini

@@ -5,10 +5,7 @@
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
 [OnFrame]
-Master Code
-0FC07078 A8000000
-C4175B8C 0000FF00
 [ActionReplay]
-Everything unlocked
+$Everything unlocked
 042232F0 00FFFFFF
 002232FC 00002FFF

Data/User/GameConfig/G4QE01.ini

@@ -6,8 +6,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C425B280 0000FF01
 $Press D-Pad Up - Team 1 Wins
 4A32C348 00000008
 40371238 00003F32

Data/User/GameConfig/G4SP01.ini

@@ -5,14 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-0658E214 98000000
-C404F588 0002FF00
-$Infinite Health
-0658E215 18000000
-04247EDC 80030BF8
-04247EE0 90030BFC
-04247EE4 4800000C
 $Max Health
 0658E216 18000000
 0425AB40 38000020

Data/User/GameConfig/G8ME01.ini

@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
 [OnFrame]
 [ActionReplay]
-$(M) Must Be ON
-C402F310 0000FF01
 $Mario: Max/Infinite Health
 04B07BD0 03E703E7
 02B07BEE 000003E7

Data/User/GameConfig/G8WP01.ini

@@ -6,9 +6,6 @@
 EmulationStateId = 4
 [OnFrame]
 [ActionReplay]
-$(M)
-0752E976 88000000
-C41641BC 0000FF01
 $Invincible
 0752E977 08000000
 04338650 00000001

Data/User/GameConfig/GAFE01.ini

@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-01521549 88000000
-C40959EC 0000FF00
 $Make Game Save Copyable (donny2112)
 01522C0A 08000000
 8C091F20 909C0028

Data/User/GameConfig/GALE01.ini

@@ -5,9 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(m)
-00080176 88000000
-C434E304 00000800
 $All 293 trophies
 00087EF5 08000000
 0245A3C8 00000125

Data/User/GameConfig/GAUE08.ini

@@ -12,8 +12,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40EBABC 0000FF00
 $Max Total Races Played
 021B301C 0000270F
 $Low Total Play Time

Data/User/GameConfig/GB4E51.ini

@@ -5,8 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C412A730 0000FF00
 $Infinite Boost
 04220D04 42C80000
 $Offensive Driving Complete

Data/User/GameConfig/GBHEC8.ini

@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = Needs Real xfb for the videos to display.
 [OnFrame]
 [ActionReplay]
-$(m)
-01180C36 88000000
-C4201E68 0000FF00
 $Max Health
 01180C37 08000000
 02264788 0000270F

Data/User/GameConfig/GBOP51.ini

@@ -5,8 +5,6 @@ EmulationStateId = 3
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4170264 00000800
 $Infinite Continues
 04233DD8 00000063
 $Infinite Boost

Data/User/GameConfig/GCCE01.ini

@@ -7,9 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M)
-04EC59D3 88000000
-C418D2E0 0000FF01
 $Infinite Health: Single Player
 04EC59D4 08000000
 0410B494 A0A3001A

Data/User/GameConfig/GCVEEB.ini

@@ -7,9 +7,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-010C0B93 88000000
-C4148F04 00001000
 $Max Lovebits
 010C0B94 08000000
 02350350 000003E7

Data/User/GameConfig/GDDE41.ini

@@ -5,8 +5,6 @@ EmulationStateId = 2
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40486D0 00000800
 $Have Infinite Lives
 04765074 00000063
 $Always Have 99 Cogs

Data/User/GameConfig/GDTE69.ini

@@ -5,8 +5,6 @@ EmulationIssues =
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40C840C 0000FF00
 $Player 1 Max Health Tank
 041B9B10 43A80000
 $Player 1 No Health Tank

Data/User/GameConfig/GE5EA4.ini

@@ -5,8 +5,6 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C41E605C 0000FF01
 $Infinite Health
 052278A8 00000226
 $Press R+Y For More Time

Data/User/GameConfig/GF7E01.ini

@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C4159190 0000FF01
 $Infinite Health
 0402C334 380006C0
 0402C3E0 380006C0

Data/User/GameConfig/GF7P01.ini

@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-06A0E452 98000000
-C4141B8C 0002FF00
 $Single Mode
 06A0E453 15008000
 $Unlock Missions

Data/User/GameConfig/GF8E69.ini

@@ -6,8 +6,6 @@ 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.
-$Master Code
-C431F6C8 0000FF01
 $Unlock All Venues
 043D2290 00000001
 $Unlock All Kits

Data/User/GameConfig/GFYE69.ini

@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4344534 0000FF01
 $Home Team Starts With 10
 2843491F 0000000A
 0043491F 0000000A

Data/User/GameConfig/GFZE01.ini

@@ -15,9 +15,6 @@ PH_ExtraParam = 0
 PH_ZNear = 20
 PH_ZFar = 1.7555555
 [ActionReplay]
-$(m)
-8C034168 4E800020
-C4034168 0000FF01
 $Beat All Cups (unlock Master class/Diamond Cup)
 9C0030C8 00120000
 840030C8 0023DC50

Data/User/GameConfig/GGTE01.ini

@@ -6,9 +6,6 @@
 EmulationStateId = 5
 [OnFrame]
 [ActionReplay]
-$(M)
-0728E818 88000000
-C4173C94 0000FF01
 $Max Battery Energy
 0728E819 08000000
 0438F74C 4479C000

Data/User/GameConfig/GHMD4F.ini

@@ -0,0 +1,16 @@
+# GHMD4F - Hitman 2: Silent Assassin
+[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 = 
+EmulationStateId = 5
+[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/GHME4F.ini

@@ -6,8 +6,6 @@ EmulationIssues =
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4229E7C 0000FF00
 $Infinite Ammo + Rapid Fire
 0417CA4C 60000000
 0417CA50 60000000
@@ -30,3 +28,11 @@ $Press Left + Y For Nailgun
 52889D30 00000801
 0406D250 418201BC
 0406D288 408000C4
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHMF4F.ini

@@ -0,0 +1,16 @@
+# GHMF4F - Hitman 2: Silent Assassin
+[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 = 
+EmulationStateId = 5
+[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/GHMP4F.ini

@@ -0,0 +1,16 @@
+# GHMP4F - Hitman 2: Silent Assassin
+[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 = 
+EmulationStateId = 5
+[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/GHQE7D.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 = 3
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False

Data/User/GameConfig/GHQP7D.ini

@@ -0,0 +1,19 @@
+# GHQP7D - The Simpsons Hit & Run
+[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]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False

Data/User/GameConfig/GHRE78.ini

@@ -10,10 +10,6 @@ EmulationStateId = 4
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(M) 
-0554D8EE 88000000
-C41F2764 0000FF01
-
 $Infinite Continues 
 0554D8EF 08000000
 040BF890 39200009

Data/User/GameConfig/GICE78.ini

@@ -5,7 +5,5 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C422AD48 0000FF01
 $Infinite Health
 04097DB8 38000064

Data/User/GameConfig/GINE69.ini

@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = FPS drops to 20 in some areas(don't know if this is normal)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C42FE4A8 0002FF01
 $Infinite Health
 040CF5D0 60000000
 $Infinite Item Use

Data/User/GameConfig/GIQE78.ini

@@ -5,8 +5,6 @@ EmulationIssues = Needs real XFB for videos to show up.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C421D274 0000FF01
 $Infinite Specials
 003BD9DB 00000003
 003BED0B 00000003

Data/User/GameConfig/GJCE8P.ini

@@ -4,8 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4210448 0000FF01
 $Infinite Health
 040B4C6C 38000064
 040B4C70 9003022C

Data/User/GameConfig/GJUE78.ini

@@ -6,8 +6,6 @@ EmulationIssues =
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4131BDC 0000FF00
 $Infinite Health
 04001A00 2C050000
 04001A04 41820008

Data/User/GameConfig/GJWE78.ini

@@ -6,8 +6,6 @@ EmulationIssues =
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C438BBEC 0000FF01
 $Infinite Health
 041D1558 D0180240
 041D155C C1B80240

Data/User/GameConfig/GJXP51.ini

@@ -0,0 +1,18 @@
+# GJXP51 - Vexx
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Slow because it needs mmu to run.
+[OnFrame]
+[ActionReplay]
+[Gecko]
+[Video_Settings]
+[Core]
+MMU = 1
+

Data/User/GameConfig/GK4E01.ini

@@ -7,9 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M)
-0768EA5C 88000000
-C41AF4FC 0000FF01
 $Save Anywhere
 0768EA5D 08000000
 002AE324 00000001

Data/User/GameConfig/GKLD69.ini

@@ -0,0 +1,18 @@
+# GKLD69 - The Lord of the Rings; The Return of the King
+[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]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GKLI69.ini

@@ -0,0 +1,18 @@
+# GKLI69 - The Lord of the Rings; The Return of the King
+[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]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GKLJ69.ini

@@ -0,0 +1,18 @@
+# GKLJ69 - The Lord of the Rings; The Return of the King
+[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]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GKNEB2.ini

@@ -4,8 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C410EE24 0000FF00
 $Infinite KIN Medals
 02296DD6 0000270F
 $All Toys

Data/User/GameConfig/GKOP6V.ini

@@ -1,6 +1,13 @@
 # GKOP6V - Kao the kangaroo
 [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
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GM4E01.ini

@@ -128,4 +128,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Core]
-VBeam = 1

Data/User/GameConfig/GM4J01.ini

@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Core]
-VBeam = 1

Data/User/GameConfig/GM4P01.ini

@@ -139,4 +139,3 @@ $Goraud Shading
 [Video]
 ProjectionHack = 0
 [Core]
-VBeam = 1

Data/User/GameConfig/GMSP01.ini

@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = needs EFB to Ram
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-00E60ADD 98000000
-C4347930 00000200
 $99 Lives
 00E60ADE 18000000
 00570967 00000063

Data/User/GameConfig/GNWE69.ini

@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C426D8F0 0000FF01
 $Max/Infinite Cash
 044477E0 05F5E0FF
 040476F4 80AD0000

Data/User/GameConfig/GO7P69.ini

@@ -4,18 +4,6 @@
 EmulationIssues=
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-018010A2 98000000
-0C554E8C 4E800020
-C4554E8C 0000FF00
-4C169C34 4E800020
-C4169C34 0002FF01
-C415795C 0000FF03
-0C5036C0 4E800020
-C45036C0 0000FF04
-4C1C3498 4E800020
-C41C3498 0000FF05
-C41438BC 0000FF06
 
 $Infinite Health
 0180E47C 18000000

Data/User/GameConfig/GOME01.ini

@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = Bad Graphics
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C4091E74 0000FF01
 $Score Once To Win Game
 00537C69 00000003
 0053932A 00000003

Data/User/GameConfig/GOWD69.ini

@@ -0,0 +1,16 @@
+# GOWD69 - NFS Most Wanted
+[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 = 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/GOWE69.ini

@@ -1,7 +1,16 @@
 # GOWE69 - NFS Most Wanted
 [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 = Some GFX Glitches And may be slow.
+EmulationIssues = 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/GOWF69.ini

@@ -0,0 +1,16 @@
+# GOWF69 - NFS Most Wanted
+[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 = 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/GOWJ69.ini

@@ -0,0 +1,16 @@
+# GOWJ69 - NFS Most Wanted
+[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 = 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/GOWP69.ini

@@ -0,0 +1,16 @@
+# GOWP69 - NFS Most Wanted
+[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 = 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/GOYE69.ini

@@ -6,13 +6,6 @@ EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-0C3F0328 4E800020
-C43F0328 0000FF01
-0C0135B8 4E800020
-C40135B8 0000FF02
-0C71AEC8 4E800020
-C471AEC8 0000FF03
 $Never Lose Health
 040A0D44 60000000
 $Never Lose Armor

Data/User/GameConfig/GP5E01.ini

@@ -7,9 +7,6 @@ EmulationIssues =
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
 [ActionReplay]
-$(M)
-044E31C5 88000000
-C4154E00 0000FF00
 $All Mini-Games Unlocked
 044E31C6 08000000
 0222A77C 0005FFFF

Data/User/GameConfig/GPHD52.ini

@@ -0,0 +1,14 @@
+# GPHD52 - Pitfall: The Lost Expedition
+[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
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+

Data/User/GameConfig/GPHP52.ini

@@ -0,0 +1,14 @@
+# GPHP52 - Pitfall: The Lost Expedition
+[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
+[Gecko]
+[Video_Settings]
+SafeTextureCacheColorSamples = 512
+

Data/User/GameConfig/GPIE01.ini

@@ -7,9 +7,6 @@ EmulationStateId = 5
 EmulationIssues =
 [OnFrame]
 [ActionReplay]
-$(m)
-04CE586A 88000000
-C4205638 0000FF00
 $Infinite Health: Captain Olimar
 04CE586B 08000000
 423D1E50 006C42C8

Data/User/GameConfig/GPNP08.ini

@@ -10,10 +10,6 @@ EmulationStateId = 4
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(m) (Updated Master Code From GCNrd) 
-03E04B5F 98000000
-C41118D4 0000FF01
-
 $Title Screen Picture Swapper;L+D-Pad Left = Prima Fusion; L+D-Pad Right = Black Bird;L+D-Pad Down = Papillion 
 03E017EC 18000000
 0A19FB0E 00000041

Data/User/GameConfig/GPSE8P.ini

@@ -1,8 +1,8 @@
 # GPSE8P - PSO CARD BATTLE
 [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
+EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = Needs Real Xfb for the videos to display. D3D11 has issues.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/GPVE01.ini

@@ -10,10 +10,6 @@ EmulationStateId = 2
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(M) 
-05B4DC4E 88000000
-C40F5B4C 0000FF01
-
 $Infinite Health 
 05B4DC4F 08000000
 04144540 60000000

Data/User/GameConfig/GQSEAF.ini

@@ -429,9 +429,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-05A0DBAC 88000000
-C4114108 0000FF01
 $Infinite Gald
 05A0DBAD 08000000
 045B68C0 05F5E0FF

Data/User/GameConfig/GREE08.ini

@@ -7,9 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-0358272E 88000000
-C42F7B90 0000FF00
 $Infinite Health
 0358272F 08000000
 424FFC30 0008270F

Data/User/GameConfig/GRNE52.ini

@@ -5,9 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-00260171 88000000
-C40CDD58 00000800
 $Infinite health
 0026005B 08000000
 0218777E 00000063

Data/User/GameConfig/GRSPAF.ini

@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-03EC2BE2 98000000
-C4193E28 0000FF00
 $Infinite Time
 03EC2BE3 18000000
 043A3694 00000063

Data/User/GameConfig/GRUE78.ini

@@ -5,8 +5,6 @@ EmulationIssues = Needs Real XFB to display videos.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C413F568 0000FF01
 $Infinite Health
 04069830 38000004
 $Quick Dino Bolts

Data/User/GameConfig/GSAP01.ini

@@ -5,9 +5,6 @@ EmulationStateId = 2
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(m)
-017E1098 98000000
-C404AC04 0000FF01
 $Fox: Infinite Health
 017E1099 18000000
 023A4A54 00001C1C

Data/User/GameConfig/GSSE8P.ini

@@ -5,8 +5,6 @@ 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
-C419DA20 00000800
 $El Fuego Have Tons Of Cash
 04238F74 05F5E0FF
 $Spirit Have Tons Of Cash

Data/User/GameConfig/GSWE64.ini

@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3

Data/User/GameConfig/GSWP64.ini

@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3

Data/User/GameConfig/GSWS64.ini

@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3

Data/User/GameConfig/GT6E70.ini

@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4389A80 0000FF01
 $Infinite Health
 04197798 60000000
 041977A4 D01F016C

Data/User/GameConfig/GTEE01.ini

@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C413E40C 0000FF01
 $Infinite Health
 04272F18 0000003C
 $Max Power

Data/User/GameConfig/GTSE4F.ini

@@ -9,8 +9,6 @@ EmulationIssues = can crash on some systems(unknown)
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-C427768C 0000FF00
 $Inf Ammo/No Reloads
 04122D9C 60000000
 04122D70 60000000

Data/User/GameConfig/GUNE5D.ini

@@ -7,9 +7,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-0020016E 88000000
-C40FE518 00000800
 $Player 1 health 9999
 0020004A 08000000
 04277374 461C3C00

Data/User/GameConfig/GWLX6L.ini

@@ -2,7 +2,9 @@
 [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
+EmulationStateId = 4
-EmulationIssues = Unespecified codes,report to devs
+EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
++$Bypass FIFO reset
+0x8028EE80:dword:0x48000638
 [ActionReplay] Add action replay cheats here.

Data/User/GameConfig/GWRE01.ini

@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(m)
-C4116318 00000800
 $Always 0 missed Buoys
 046199F4 00000000
 $Always turbo

Data/User/GameConfig/GWRP01.ini

@@ -7,8 +7,6 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [ActionReplay] Add action replay cheats here.
-$(M)
-C411794C 00000800
 $Always First Place
 0061C57B 00000000
 $Never Out of Bounds

Data/User/GameConfig/GX2P52.ini

@@ -0,0 +1,18 @@
+# GX2P52 - X-Men Legends 2: Rise of Apocalypse
+[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_Enhancements]
+

Data/User/GameConfig/GX3P41.ini

@@ -4,7 +4,7 @@ TLBHack = 1
 MMU = 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 show up (r6906)
+EmulationIssues = Needs real xfb for the videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GX3X41.ini

@@ -0,0 +1,21 @@
+# GX3X41 - XIII
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+MMU = 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 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
+

Data/User/GameConfig/GXSP8P.ini

@@ -4,14 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(m)
-038C28E4 98000000
-C4046DD0 0000FF00
-040032C0 3FE08000
-040032C4 90BF32BC
-040032C8 7CBF2B78
-040032CC 483E1C18
-043E4EE0 4BC1E3E0
 $999 Rings
 038C28E5 18000000
 027884C8 000003E6

Data/User/GameConfig/GZ2P01.ini

@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M)
-C435E298 0000FF01
 $Infinite Health
 00408163 00000050
 $Max Health

Data/User/GameConfig/GZLE01.ini

@@ -20,8 +20,6 @@ $Snow test room
 0x803C9D48:dword:0x49546573
 0x803C9D4C:dword:0x74363200
 [ActionReplay]
-$Master Code (useless)
-C4323EA8 0000FF00
 $Shadow Link
 423BCDA0 00BCFFFF
 423BCDA0 00BDFF87

Data/User/GameConfig/GZLP01.ini

@@ -21,8 +21,6 @@ $Snow test room
 0x803C9D48:dword:0x49546573
 0x803C9D4C:dword:0x74363200
 [ActionReplay]
-$(M)
-C4329400 0000FF00
 $Maximum Health
 003CC531 00000050
 $Infinite Health

Data/User/GameConfig/JAAE01.ini

@@ -1,8 +1,17 @@
 # JAAE01 - Super Mario World 
 [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 = No Sound
+EmulationIssues = 
 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]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/RBHE08.ini

@@ -1,6 +1,5 @@
 # RBHE08 - Resident Evil Archives: Resident Evil Zero
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 

Data/User/GameConfig/RBHJ08.ini

@@ -1,6 +1,5 @@
 # RBHJ08 - Biohazard 0
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 

Data/User/GameConfig/RBHP08.ini

@@ -1,6 +1,5 @@
 # RBHP08 - Resident Evil Archives: Resident Evil Zero
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 

Data/User/GameConfig/SB3E08.ini

@@ -1,7 +1,7 @@
 # SB3E08 - BASARA
 [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 = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.