Merge branch 'master' into FIFO-BP

# By Jordan Woyak (46) and others
# Via Jordan Woyak (2) and others
* master: (70 commits)
  Fixes two memory leaks, one is pretty bad for OSX. Yell at pauldachz if this doesn't work. Or... say thanks.
  Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
  Make ARMJit core default CPU core on ARM architecture
  Fix a StringUtil regression from the arm-noglsl merge
  Small improvement to cmpli/cmpi in ARMJit.
  Merge latest ArmEmitter changes from ppsspp while we're at it.
  Ah. I blame vim on this typo entirely.
  Add disabled code for authenticating wiimotes on Windows.
  Add the missing FPR cache
  Buildfix.
  Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
  Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
  Abort loading states from incompatible graphics backends.
  ARM Support without GLSL
  Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
  Begin implementing save states to video software. Kind of works, sometimes.
  Make error message for loading save state with wrong dsp engine shorter.
  Abort load state if it uses a different dsp engine, instead of crashing.
  Update the gameini of F-zero. Efb to Ram is no longer the default choice.
  fix last commit by neobrain
  ...

Conflicts:
	Source/Core/VideoCommon/Src/Fifo.cpp

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
-EmulationIssues = Severe graphic issues.
+EmulationStateId = 4
+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
-EmulationIssues = Severe graphic issues.
+EmulationStateId = 4
+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
-EmulationIssues = Severe graphic issues.
+EmulationStateId = 4
+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

@@ -17,5 +17,4 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]␍

Data/User/GameConfig/R22J01.ini

@@ -17,5 +17,4 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]␍

Data/User/GameConfig/R22P01.ini

@@ -17,5 +17,4 @@ PH_ZFar =
 SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]␍

Data/User/GameConfig/R3ME01.ini

@@ -1,20 +1,19 @@
-# R3ME01 - Metroid Prime Trilogy
-[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-[Wii]
-DisableWiimoteSpeaker = 1
+# R3ME01 - Metroid Prime Trilogy
+[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
+[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]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Wii]␍

Data/User/GameConfig/R3MP01.ini

@@ -1,20 +1,19 @@
-# R3MP01 - Metroid Prime Trilogy
-[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
-[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]
-EFBToTextureEnable = False
-EFBCopyEnable = True
-[Wii]
-DisableWiimoteSpeaker = 1
+# R3MP01 - Metroid Prime Trilogy
+[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 = Disable EuRGB60(PAL60) to avoid a black bar appearing.
+[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]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Wii]␍

Data/User/GameConfig/R4QE01.ini

@@ -1,20 +1,19 @@
-# R4QE01 - Mario Strikers Charged
-[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 = 5
-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]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QE01 - Mario Strikers Charged
+[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 = 5
+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]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]␍

Data/User/GameConfig/R4QJ01.ini

@@ -1,20 +1,19 @@
-# R4QJ01 - Mario Strikers Charged
-[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 = 5
-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]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QJ01 - Mario Strikers Charged
+[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 = 5
+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]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]␍

Data/User/GameConfig/R4QK01.ini

@@ -1,20 +1,19 @@
-# R4QK01 - Mario Power Soccer
-[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 = 5
-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]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QK01 - Mario Power Soccer
+[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 = 5
+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]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]␍

Data/User/GameConfig/R4QP01.ini

@@ -1,20 +1,19 @@
-# R4QP01 - Mario Strikers Charged
-[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 = 5
-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]
-[Video_Hacks]
-DlistCachingEnable = False
-[Wii]
-DisableWiimoteSpeaker = 1
+# R4QP01 - Mario Strikers Charged
+[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 = 5
+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]
+[Video_Hacks]
+DlistCachingEnable = False
+[Wii]␍

Data/User/GameConfig/R5WEA4.ini

@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]␍
 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]␍

Data/User/GameConfig/R5WJA4.ini

@@ -15,5 +15,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]␍
 SafeTextureCacheColorSamples = 512
-[Wii]
-DisableWiimoteSpeaker = 1
+[Wii]␍

Data/User/GameConfig/R7PE01.ini

@@ -1,19 +1,18 @@
-# R7PE01 - Punch Out
-[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 = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
-[OnFrame] Add memory patches to be applied every frame here.
-+$Patch
-0x8011E0F8:dword:0x4E800020
-[ActionReplay] Add action replay cheats here.
-[Video]
-ProjectionHack = 0
-PH_SZNear = 0
-PH_SZFar = 0
-PH_ExtraParam = 0
-PH_ZNear = 
-PH_ZFar = 
-[Gecko]
-[Wii]
-DisableWiimoteSpeaker = 1
+# R7PE01 - Punch Out
+[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 = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run
+[OnFrame] Add memory patches to be applied every frame here.
++$Patch
+0x8011E0F8:dword:0x4E800020
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Wii]␍