Merge branch 'master' into zcomploc-support

Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp
2026-06-19 01:16:48 -07:00 · 2012-03-22 15:21:52 +01:00
parent 006923e871 d95e31af3f
commit 0ffc12bbfd
854 changed files with 42647 additions and 21611 deletions
@@ -2,16 +2,33 @@
 # General setup
 #
 cmake_minimum_required(VERSION 2.6)
+
+# Update compiler before calling project()
+if (APPLE)
+	# Use clang compiler
+	set(CMAKE_C_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang")
+	set(CMAKE_CXX_COMPILER "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++")
+	if (NOT EXISTS "${CMAKE_CXX_COMPILER}")
+		set(CMAKE_C_COMPILER "clang")
+		set(CMAKE_CXX_COMPILER "clang++")
+	endif()
+endif()
 project(dolphin-emu)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 set(DOLPHIN_IS_STABLE FALSE)

 # Set up paths
-set(bindir		${CMAKE_INSTALL_PREFIX}/bin					CACHE PATH "bindir")
-set(datadir		${CMAKE_INSTALL_PREFIX}/share/dolphin-emu	CACHE PATH "datadir")
+if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+	# The gettext module will install the translations unconditionally.
+	# Redirect the installation to a build directory where it does no harm.
+	set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install-dummy)
+else()
+	set(bindir  ${CMAKE_INSTALL_PREFIX}/bin               CACHE PATH "bindir")
+	set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
+	add_definitions(-DDATA_DIR="${datadir}/")
+endif()
 set(userdir ".dolphin-emu" CACHE STRING "User directory")
 add_definitions(-DUSER_DIR="${userdir}")
-add_definitions(-DDATA_DIR="${datadir}/")

 # Set where the binary files will be built.  The program will not execute from
 # here.  You must run "make install" to install these to the proper location
@@ -67,6 +84,15 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()

+# version number
+set(DOLPHIN_VERSION_MAJOR "3")
+set(DOLPHIN_VERSION_MINOR "0")
+if(DOLPHIN_IS_STABLE)
+	set(DOLPHIN_VERSION_PATCH "0")
+else()
+	set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
+endif()
+
 # Various compile flags
 add_definitions(-msse2)

@@ -100,25 +126,68 @@ if(UNIX AND NOT APPLE)
 endif()

 if (APPLE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
+	# Ignore MacPorts and Fink and any other locally installed packages that
+	# might prevent building a distributable binary.
+	set(CMAKE_SYSTEM_PREFIX_PATH /usr)
+	set(ENV{PATH} /usr/bin:/bin:/usr/sbin:/sbin)
+
+	# Some of our code contains Objective C constructs.
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -x objective-c")
-	FIND_LIBRARY(ATB_LIBRARY AudioToolbox)
-	FIND_LIBRARY(AU_LIBRARY AudioUnit)		
-	FIND_LIBRARY(CARBON_LIBRARY Carbon)
-	FIND_LIBRARY(COCOA_LIBRARY Cocoa)
-	FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio)
-	FIND_LIBRARY(COREFUND_LIBRARY CoreFoundation)
-	FIND_LIBRARY(CORESERV_LIBRARY CoreServices)
-	FIND_LIBRARY(IOB_LIBRARY IOBluetooth)
-	FIND_LIBRARY(IOK_LIBRARY IOKit)		
-	FIND_LIBRARY(OGL_LIBRARY OpenGL)
-	FIND_LIBRARY(WEBKIT_LIBRARY WebKit)		
-	SET(EXTRA_LIBS ${ATB_LIBRARY} ${AU_LIBRARY} ${CARBON_LIBRARY}
-		${COCOA_LIBRARY} ${COREAUDIO_LIBRARY} ${COREFUND_LIBRARY}
-		${CORESERV_LIBRARY} ${IOB_LIBRARY} ${IOK_LIBRARY} ${OGL_LIBRARY}
-		${WEBKIT_LIBRARY})
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
+	# Avoid mistaking an object file for a source file on the link command line.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -x none")
+
+	# Identify the target system:
+	# Ask for 32/64-bit fat binary.
+	set(TARGET_FLAGS "-arch x86_64 -arch i386")
+	# Minimum OS X version.
+	# This is inserted into the Info.plist as well.
+	# Note that the SDK determines the maximum version of which optional
+	# features can be used, not the minimum required version to run.
+	set(OSX_MIN_VERSION "10.5.4")
+	set(TARGET_FLAGS "${TARGET_FLAGS} -mmacosx-version-min=${OSX_MIN_VERSION}")
+	set(TARGET_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+	if (NOT EXISTS "${TARGET_SYSROOT}/")
+		set(TARGET_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk")
+	endif()
+	set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk")
+	# Do not warn about frameworks that are not available on all architectures.
+	# 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.
+	# CMake passes these to the compiler on the link command line as well.
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_FLAGS}")
+
+	# Linker flags.
+	# Drop unreachable code and data.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip,-dead_strip_dylibs")
+	# Reserve the minimum size for the zero page.
+	# Our JIT requires virtual memory space below 2GB, while the default zero
+	# page on x86_64 is 4GB in size.
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
+
+	find_library(APPKIT_LIBRARY AppKit)
+	find_library(APPSERV_LIBRARY ApplicationServices)
+	find_library(ATB_LIBRARY AudioToolbox)
+	find_library(AU_LIBRARY AudioUnit)
+	find_library(CARBON_LIBRARY Carbon)
+	find_library(COCOA_LIBRARY Cocoa)
+	find_library(COREAUDIO_LIBRARY CoreAudio)
+	find_library(COREFUND_LIBRARY CoreFoundation)
+	find_library(CORESERV_LIBRARY CoreServices)
+	find_library(IOB_LIBRARY IOBluetooth)
+	find_library(IOK_LIBRARY IOKit)
+	find_library(QUICKTIME_LIBRARY QuickTime)
+	find_library(WEBKIT_LIBRARY WebKit)
 endif()
- 
+
 if(WIN32)
 	add_definitions(-D_SECURE_SCL=0)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -234,7 +303,9 @@ else()
 	add_definitions(-DHAVE_X11=0)
 endif()

-check_lib(XRANDR Xrandr)
+if(X11_FOUND)
+	check_lib(XRANDR Xrandr)
+endif()
 if(XRANDR_FOUND)
 	add_definitions(-DHAVE_XRANDR=1)
 else()
@@ -303,22 +374,27 @@ include_directories(Source/Core/VideoUICommon/Src)
 add_subdirectory(Externals/Bochs_disasm)
 include_directories(Externals/Bochs_disasm)

-check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	check_lib(LZO lzo2 lzo/lzo1x.h QUIET)
+endif()
 if(LZO_FOUND)
 	message("Using shared lzo")
 else()
-	message("Shared lzo not found, falling back to the static library")
+	message("Using static lzo from Externals")
 	add_subdirectory(Externals/LZO)
 	include_directories(Externals/LZO)
+	set(LZO lzo2)
 endif()

-include(FindSDL OPTIONAL)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	include(FindSDL OPTIONAL)
+endif()
 if(SDL_FOUND)
 	message("Using shared SDL")
 	include_directories(${SDL_INCLUDE_DIR})
 else(SDL_FOUND)
 	# TODO: Use the prebuilt one on Windows
-	message("Shared SDL not found, falling back to the static library")
+	message("Using static SDL from Externals")
 	include_directories(Externals/SDL Externals/SDL/include)
 	add_subdirectory(Externals/SDL)
 endif(SDL_FOUND)
@@ -326,20 +402,24 @@ endif(SDL_FOUND)
 set(SFML_FIND_VERSION TRUE)
 set(SFML_FIND_VERSION_MAJOR 1)
 set(SFML_FIND_VERSION_MINOR 5)
-include(FindSFML OPTIONAL)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	include(FindSFML OPTIONAL)
+endif()
 if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
       message("Using shared SFML")
 else()
-       message("Shared SFML < 2.0 not found, falling back to the static library")
+       message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
       add_subdirectory(Externals/SFML)
       include_directories(Externals/SFML/include)
 endif()

-check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
+endif()
 if(SOIL_FOUND)
 	message("Using shared SOIL")
 else()
-	message("Shared SOIL not found, falling back to the static library")
+	message("Using static SOIL from Externals")
 	add_subdirectory(Externals/SOIL)
 	include_directories(Externals/SOIL)
 endif()
@@ -363,27 +443,55 @@ if(WIN32)
 	find_library(GLEW glew32s PATHS Externals/GLew)
 	include_directories(Externals/GLew/include)
 else()
-	check_lib(GLEW GLEW GL/glew.h)
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		check_lib(GLEW GLEW GL/glew.h)
+	endif()
 	if(NOT GLEW_FOUND)
-		message("Shared GLEW not found, falling back to the static library")
+		message("Using static GLEW from Externals")
 		add_subdirectory(Externals/GLew)
 		include_directories(Externals/GLew/include)
 	endif(NOT GLEW_FOUND)

-	check_lib(CG Cg Cg/cg.h)
+	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(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	find_library(CL OpenCL)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-weak_framework,OpenCL")
+else()
 	include_directories(Externals/CLRun/include)
 	add_subdirectory(Externals/CLRun)
 endif()

 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 if(NOT DISABLE_WX)
-	include(FindwxWidgets OPTIONAL)
-	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		include(FindwxWidgets OPTIONAL)
+		FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
+	endif()

+	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)
 		include(${wxWidgets_USE_FILE})

@@ -413,9 +521,18 @@ if(NOT DISABLE_WX)
 		if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 			message(FATAL_ERROR "wxWidgets not found.  It is required to build the GUI")
 		endif()
-		message("Shared wxWidgets not found, falling back to the static library")
-		include_directories(Externals/wxWidgets/include)
-		add_subdirectory(Externals/wxWidgets)
+		message("Using static wxWidgets from Externals")
+		if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+			add_definitions(-D__WXOSX_COCOA__)
+			include_directories(Externals/wxWidgets3)
+			include_directories(Externals/wxWidgets3/include)
+			add_subdirectory(Externals/wxWidgets3)
+			set(wxWidgets_LIBRARIES "wx")
+		else()
+			include_directories(Externals/wxWidgets/include)
+			add_subdirectory(Externals/wxWidgets)
+		endif()
+		set(wxWidgets_FOUND TRUE)
 	endif(wxWidgets_FOUND)
 	add_definitions(-DHAVE_WX=1)
 endif(NOT DISABLE_WX)
@@ -450,34 +567,32 @@ option(UNITTESTS "Build unitests" OFF)
 ########################################
 # Start compiling our code
 #
+add_definitions(-std=gnu++0x)
 add_subdirectory(Source)


 ########################################
 # Install shared data files
 #
-install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE)
-install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE)
+if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
+	install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN)
+	install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
+endif()
 include(FindGettext)
 if(GETTEXT_FOUND AND NOT DISABLE_WX)
 	file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/po/*.po) 
 	GETTEXT_CREATE_TRANSLATIONS(Languages/po/dolphin-emu.pot ALL ${LINGUAS})
 endif()
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
 	install(FILES Data/license.txt DESTINATION ${datadir})
 endif()

 # packaging information
 set(CPACK_PACKAGE_NAME "dolphin-emu")
 set(CPACK_PACKAGE_VENDOR "Dolphin Team")
-set(CPACK_PACKAGE_VERSION_MAJOR "3")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-
-if(DOLPHIN_IS_STABLE)
-	set(CPACK_PACKAGE_VERSION_PATCH "0")
-else()
-	set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_WC_REVISION})
-endif()
+set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH})

 # TODO: CPACK_PACKAGE_DESCRIPTION_FILE
 # TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY
@@ -55,14 +55,15 @@ endmacro()

 macro(check_libav)
 	if(PKG_CONFIG_FOUND)
-		pkg_check_modules(LIBAV libavcodec>=52.72.2 libavformat>=52.64.2
-			libswscale>=0.11.0 libavutil>=50.15.1)
+		pkg_check_modules(LIBAV libavcodec>=53.5.0 libavformat>=53.2.0
+			libswscale>=2.0.0 libavutil>=51.7.0)
 	else()
 		message("pkg-config is required to check for libav")
 	endif()
 	if(LIBAV_FOUND)
 		message("libav found, enabling AVI frame dumps")
 		add_definitions(-DHAVE_LIBAV)
+		include_directories(${LIBAV_INCLUDE_DIRS})
 	else()
 		message("libav not found, disabling AVI frame dumps")
 	endif()
@@ -2,6 +2,17 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = No sound/bad sound
+EmulationIssues = Needs LLE audio for sound ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
@@ -2,5 +2,17 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
+EmulationIssues = Needs LLE audio for sound ingame.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
@@ -2,8 +2,7 @@
 [EmuState]
 #The Emulation State.
 EmulationStateId = 4
-Issues="Scanner does not work, music is buggy, scanner mode is buggy"
-EmulationIssues = 
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. 
 [Speedhacks]
 0x803758bc=400
 [OnFrame]
@@ -131,6 +130,20 @@ $Have Ing Hive Temple Key 2
 4241FD80 011B0001
 $Have Ing Hive Temple Key 3
 4241FD80 011F0001
+$One Hit Kill
+0403DB68 4BFC539C
+04002F04 FFC00090
+04002F08 7C1BE050
+04002F0C 2C000010
+04002F10 41820008
+04002F14 EFDEF028
+04002F18 4803AC54
+$Full Logbook
+0421166C 4BDF18CC
+04002F38 3BE000FF
+04002F3C 9BE50004
+04002F40 88050004
+04002F44 4820E72C
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -1,15 +1,147 @@
-# G2MP01 - Metroid Prime 2 Echoes[EmuState]
+# G2MP01 - Metroid Prime 2 Echoes
+[EmuState]
 #The Emulation State.
-EmulationStateId = 2
-Issues="Scanner does not work, music is buggy, scanner mode is buggy"
+EmulationStateId = 4
+EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly. 
 [Speedhacks]
 #Patch OSYieldThread to take more time - MP2's idle loop is really stupid.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-[EmuState]
-EmulationStateId = 4
-EmulationIssues = needs safe texture cache and EFB to Ram
+$(M)
+C43552C8 0000FF01
+C436F41C 0000FF02
+0D30294C 4E800020
+C530294C 0000FF03
+$Infinite Health
+423DDE0C 000A44BB
+423DDE0C 000B6000
+$Max Energy Tanks
+423DDE0C 012B000E
+423DDE0C 012D000E
+$Maximum Missiles
+423DDE0C 013900FA
+$Infinite Missiles
+423DDE0C 013700FA
+$Moon Jump (Hold B)
+3A705F24 00000200
+423DDDFC 00D84101
+$Have Charge Beam
+423DDE0C 00310001
+423DDE0C 00330001
+$Have Dark Beam
+423DDE0C 00370001
+423DDE0C 00390001
+$Have Light Beam
+423DDE0C 003D0001
+423DDE0C 003F0001
+$Have Annihilator
+423DDE0C 00430001
+423DDE0C 00450001
+$Have Super Missile
+423DDE0C 00470001
+423DDE0C 00490001
+$Have Darkburst
+423DDE0C 004D0001
+423DDE0C 004F0001
+$Have Sunburst
+423DDE0C 00530001
+423DDE0C 00550001
+$Have Sonic Boom
+423DDE0C 00590001
+423DDE0C 005B0001
+$Have Combat Visor
+423DDE0C 005F0001
+423DDE0C 00610001
+$Have Scan Visor
+423DDE0C 00650001
+423DDE0C 00670001
+$Have Dark Visor
+423DDE0C 006B0001
+423DDE0C 006D0001
+$Have Echo Visor
+423DDE0C 00710001
+423DDE0C 00730001
+$Have Varia Suit
+423DDE0C 00770001
+423DDE0C 00790001
+$Have Dark Suit
+423DDE0C 007D0001
+423DDE0C 007F0001
+$Have Light Suit
+423DDE0C 00830001
+423DDE0C 00850001
+$Have Space Jump Boots
+423DDE0C 00BF0001
+423DDE0C 00C10001
+$Have Grapple Beam
+423DDE0C 00B90001
+423DDE0C 00BB0001
+$Have Gravity Boost
+423DDE0C 00C50001
+423DDE0C 00C70001
+$Have Screw Attack
+423DDE0C 00D10001
+423DDE0C 00D30001
+$Have Seeker Missile
+423DDE0C 00CB0001
+423DDE0C 00CD0001
+$Have Morph Ball Power Bomb
+423DDE0C 01310001
+423DDE0C 01330001
+$Have Beam Ammo Expansion
+423DDE0C 013D000F
+423DDE0C 013F000F
+$Have Sky Temple Key 1
+423DDE0C 00DD0001
+423DDE0C 00DF0001
+$Have Sky Temple Key 2
+423DDE0C 00E30001
+423DDE0C 00E50001
+$Have Sky Temple Key 3
+423DDE0C 00E90001
+423DDE0C 00EB0001
+$Have Agon Temple Key 1
+423DDE0C 00EF0001
+423DDE0C 00F10001
+$Have Agon Temple Key 2
+423DDE0C 00F50001
+423DDE0C 00F70001
+$Have Agon Temple Key 3
+423DDE0C 00FB0001
+423DDE0C 00FD0001
+$Have Torvus Temple Key 1
+423DDE0C 01010001
+423DDE0C 01030001
+$Have Torvus Temple Key 2
+423DDE0C 01070001
+423DDE0C 01090001
+$Have Torvus Temple Key 3
+423DDE0C 010D0001
+423DDE0C 010F0001
+$Have Ing Hive Temple Key 1
+423DDE0C 01130001
+423DDE0C 01150001
+$Have Ing Hive Temple Key 2
+423DDE0C 01190001
+423DDE0C 011B0001
+$Have Ing Hive Temple Key 3
+423DDE0C 011F0001
+423DDE0C 01210001
+$One Hit Kill
+0403DCB8 4BFC524C
+04002F04 FFC00090
+04002F08 7C1BE050
+04002F0C 2C000010
+04002F10 41820008
+04002F14 EFDEF028
+04002F18 4803ADA4
+$Full Logbook
+04211974 4BDF15C4
+04002F38 3BE000FF
+04002F3C 9BE50004
+04002F40 88050004
+04002F44 4820EA34
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0
@@ -8,6 +8,12 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
@@ -1,8 +1,9 @@
 # G2XE8P - SONIC GEMS COLLECTION
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Everything playable with minor glitches, except Sonic the Fighters.
+EmulationIssues = Everything playable with minor glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +14,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Hacks]
+DlistCachingEnable = False
@@ -1,8 +1,9 @@
 # G2XP8P - SONIC GEMS COLLECTION
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Everything playable with minor glitches, except Sonic the Fighters.
+EmulationIssues = Everything playable with minor glitches.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +14,8 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
+[Video_Hacks]
+DlistCachingEnable = False
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -16,3 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -16,5 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
-SafeTextureCacheColorSamples = 512
-
+SafeTextureCacheColorSamples = 0
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -16,3 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 0
+EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -16,3 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
+SafeTextureCacheColorSamples = 0
@@ -0,0 +1,15 @@
+# G3LE8P - Super Monkey Ball Adventures (TM)
+[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 = 0
+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]
@@ -8,6 +8,12 @@ EmulationIssues =
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
 [Video_Settings]
 SafeTextureCache = True
+SafeTextureCacheColorSamples = 512
@@ -7,7 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]#Add memory patches here.
 [Video_Enhancements]
-PostProcessingShader = 
 [Video_Hacks]
 DlistCachingEnable = False
 [Video]
@@ -1,11 +1,16 @@
 # G4FD69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed 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]
@@ -1,12 +1,16 @@
 # G4FE69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationStateId = 4
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed 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]
-
@@ -1,11 +1,16 @@
 # G4FF69 - FIFA 07
 [Core] Values set here will override the main dolphin settings.
-MMU = 1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Sound issues need LLE plugin and videos are messed up. Slow due to MMU(r6932)
+EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed 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]
--- a/Show More
+++ b/Show More