Merge branch 'master' of https://code.google.com/p/dolphin-emu

Data/Sys/GameSettings/G9RD7D.ini

@@ -0,0 +1,21 @@
+# G9RD7D - Crash Tag Team Racing
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+SkipIdle = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Idle skipping can cause speed issues.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/G9RE7D.ini

@@ -3,10 +3,11 @@
 [Core]
 # Values set here will override the main dolphin settings.
 TLBHack = 1
+SkipIdle = 0
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = May be slow
+EmulationIssues = Idle skipping can cause speed issues.
 EmulationStateId = 4
 
 [OnLoad]

Data/Sys/GameSettings/G9RF7D.ini

@@ -0,0 +1,21 @@
+# G9RF7D - Crash Tag Team Racing
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+SkipIdle = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Idle skipping can cause speed issues.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/G9RP7D.ini

@@ -0,0 +1,21 @@
+# G9RP7D - Crash Tag Team Racing
+
+[Core]
+# Values set here will override the main dolphin settings.
+TLBHack = 1
+SkipIdle = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Idle skipping can cause speed issues.
+EmulationStateId = 4
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/GDMJ01.ini

@@ -0,0 +1,22 @@
+# GDMJ01 - Disney's Mickey Mouse no Fushigi na Kagami
+
+[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 = 3
+EmulationIssues =
+
+[Video]
+UseBBox = True
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/GDMP01.ini

@@ -0,0 +1,22 @@
+# GDMP01 - Disney's Magical Mirror starring Mickey Mouse
+
+[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 = 3
+EmulationIssues =
+
+[Video]
+UseBBox = True
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/GHVP08.ini

@@ -0,0 +1,22 @@
+# GHVP08 - Disney's Hide & Sneak
+
+[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 = 3
+EmulationIssues = bad GFX
+
+[Video]
+UseBBox = True
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/GKBEAF.ini

@@ -1,8 +1,8 @@
-# GKBEAF - Baten Kaitos
+# GKBEAF - Baten Kaitos Eternal Wings and the Lost Ocean
 
 [Core]
 # Values set here will override the main dolphin settings.
-SyncGPU = 1
+CPUThread = 0
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -28,6 +28,8 @@ PH_ZFar =
 
 [Video_Hacks]
 EFBAccessEnable = False
-EFBCopyEnable = True
+
-EFBToTextureEnable = False
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False
 

Data/Sys/GameSettings/GKBJAF.ini

@@ -0,0 +1,34 @@
+# GKBJAF - Baten Kaitos: Owaranai Tsubasa to Ushinawareta Umi
+
+[Core]
+# Values set here will override the main dolphin settings.
+CPUThread = 0
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues =
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[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 =
+
+[Video_Hacks]
+EFBAccessEnable = False
+
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False

Data/Sys/GameSettings/GKBPAF.ini

@@ -1,8 +1,8 @@
-# GKBPAF - Baten Kaitos
+# GKBPAF - Baten Kaitos Eternal Wings and the Lost Ocean
 
 [Core]
 # Values set here will override the main dolphin settings.
-SyncGPU = 1
+CPUThread = 0
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
@@ -28,6 +28,7 @@ PH_ZFar =
 
 [Video_Hacks]
 EFBAccessEnable = False
-EFBCopyEnable = True
-EFBToTextureEnable = False
 
+[Video_Settings]
+UseXFB = True
+UseRealXFB = False

Data/Sys/GameSettings/SVXE52.ini

@@ -0,0 +1,30 @@
+# SVXE52 - Skylanders: Swap Force
+
+[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 = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[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 =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/SVXF52.ini

@@ -0,0 +1,30 @@
+# SVXF52 - Skylanders: Swap Force
+
+[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 = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[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 =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/SVXI52.ini

@@ -0,0 +1,30 @@
+# SVXI52 - Skylanders: Swap Force
+
+[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 = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[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 =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/SVXP52.ini

@@ -0,0 +1,30 @@
+# SVXP52 - Skylanders: Swap Force
+
+[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 = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[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 =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/Sys/GameSettings/SVXY52.ini

@@ -0,0 +1,30 @@
+# SVXY52 - Skylanders: Swap Force
+
+[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 = 3
+EmulationIssues = 
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[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 =
+
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Source/Core/Common/x64Emitter.cpp

@@ -112,9 +112,9 @@ const u8 *XEmitter::AlignCodePage()
 	return code;
 }
 
-void XEmitter::WriteModRM(int mod, int rm, int reg)
+void XEmitter::WriteModRM(int mod, int reg, int rm)
 {
-	Write8((u8)((mod << 6) | ((rm & 7) << 3) | (reg & 7)));
+	Write8((u8)((mod << 6) | ((reg & 7) << 3) | (rm & 7)));
 }
 
 void XEmitter::WriteSIB(int scale, int index, int base)