IMPORTANT:

Dolphin will now only look for the correct game IDs of the Triforce games! If you are not using the right game ID Dolphin will use default controls. Added user paths for Triforce Moved DI-AMBaseboard code to its own file: AMBaseboard.cpp Rewritten the DI-AMBaseboard code Updated code to use the File interface for file access All Triforce files will now be stored in the User's directory Updated code syntax Added multiple comments
EIGHTFINITE · Jan 25, 2014 · 0ac41c2 · 0ac41c2
1 parent 2240200
commit 0ac41c2
Show file tree

Hide file tree

Showing 13 changed files with 617 additions and 526 deletions.
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h
@@ -57,6 +57,7 @@
 
 // Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
 #define GC_USER_DIR			"GC"
+#define TRIFORCE_USER_DIR	"Triforce"
 #define WII_USER_DIR		"Wii"
 #define CONFIG_DIR			"Config"
 #define GAMESETTINGS_DIR	"GameSettings"

diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
@@ -804,6 +804,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 #endif
 
 		paths[D_GCUSER_IDX]			= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
+		paths[D_TRIUSER_IDX]		= paths[D_USER_IDX] + TRIFORCE_USER_DIR DIR_SEP;
 		paths[D_WIIROOT_IDX]		= paths[D_USER_IDX] + WII_USER_DIR;
 		paths[D_WIIUSER_IDX]		= paths[D_WIIROOT_IDX] + DIR_SEP;
 		paths[D_CONFIG_IDX]			= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;

diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h
@@ -19,6 +19,7 @@
 enum {
 	D_USER_IDX,
 	D_GCUSER_IDX,
+	D_TRIUSER_IDX,
 	D_WIIROOT_IDX,
 	D_WIIUSER_IDX,
 	D_CONFIG_IDX, // global settings

diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
@@ -142,6 +142,7 @@
     <ClCompile Include="Src\HW\GCPadEmu.cpp" />
     <ClCompile Include="Src\HW\GPFifo.cpp" />
     <ClCompile Include="Src\HW\HW.cpp" />
+    <ClCompile Include="Src\HW\AMBaseboard.cpp" />
     <ClCompile Include="Src\HW\Memmap.cpp" />
     <ClCompile Include="Src\HW\MemmapFunctions.cpp" />
     <ClCompile Include="Src\HW\MemoryInterface.cpp" />
@@ -340,6 +341,7 @@
     <ClInclude Include="Src\HW\GCPadEmu.h" />
     <ClInclude Include="Src\HW\GPFifo.h" />
     <ClInclude Include="Src\HW\HW.h" />
+    <ClInclude Include="Src\HW\AMBaseboard.h" />
     <ClInclude Include="Src\HW\Memmap.h" />
     <ClInclude Include="Src\HW\MemoryInterface.h" />
     <ClInclude Include="Src\HW\ProcessorInterface.h" />
@@ -473,4 +475,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
@@ -154,19 +154,14 @@ bool CBoot::EmulatedBS2_GC()
 
 	// If we have any patches that need to be applied very early, here's a good place
 	PatchEngine::ApplyFramePatches();
-
-	int GCAM = ((SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_AM_BASEBOARD)
-		&& (SConfig::GetInstance().m_EXIDevice[2] == EXIDEVICE_AM_BASEBOARD))
-		? 1 : 0;
 
-	//Clear mediaboard encryption seeds
-	if(GCAM)
+	//Clear media board encryption seeds
+	if(DVDInterface::IsAMBaseboard())
 	{
 		char *ptr = (char*)(Memory::GetPointer(0));
 		memset( ptr, 0, 12 );
 	}
 
-
 	return true;
 }