Merge remote-tracking branch 'upstream/master'

OpenParrot/src/Functions/Games/ES3X/TER.cpp

@@ -0,0 +1,32 @@
+#include <StdInc.h>
+#include "Utility/InitFunction.h"
+#include "Functions/Global.h"
+#include "MinHook.h"
+#include <Utility/Hooking.Patterns.h>
+#include <thread>
+#ifdef _M_AMD64
+#pragma optimize("", off)
+#pragma comment(lib, "Ws2_32.lib")
+
+extern LPCSTR hookPort;
+
+static InitFunction Tekken7Func([]()
+	{
+		hookPort = ("COM3");
+		uintptr_t imageBase = (uintptr_t)GetModuleHandleA(0);
+
+		// Skip all errors
+		injector::MakeNOP(imageBase + 0x25E791, 5);
+
+		// First Check Error
+		injector::MakeNOP(imageBase + 0x268E00, 5);
+
+		// Windowed
+		if (ToBool(config["General"]["Windowed"]))
+		{
+			// TODO: DOCUMENT PATCHES
+			injector::WriteMemory<LONGLONG>(imageBase + 0x115E757, 0xF633C1FFC1FFC933, true);
+			injector::WriteMemory<DWORD>(imageBase + 0x115E757 + 0x08, 0xC6FFC6FF, true);
+		}
+	}, GameID::TER);
+#endif

OpenParrot/src/Functions/WindowedDx8.cpp

@@ -80,6 +80,8 @@ static InitFunction initFunc([]()
 {
 	if (GameDetect::currentGame == GameID::BG4)
 		return;
+	if (GameDetect::currentGame == GameID::TER)
+		return;
 	if (GameDetect::currentGame == GameID::FNFSC)
 		InitD3D8WindowHook();
 	if (ToBool(config["General"]["Windowed"]))

OpenParrot/src/Functions/WindowedDx9.cpp

@@ -70,7 +70,7 @@ extern linb::ini config;
 
 static InitFunction initFunc([]()
 {
-	if (GameDetect::currentGame == GameID::BG4 || GameDetect::currentGame == GameID::JLeague)
+	if (GameDetect::currentGame == GameID::BG4 || GameDetect::currentGame == GameID::JLeague || GameDetect::currentGame == GameID::TER)
 		return;
 	if (ToBool(config["General"]["Windowed"]))
 	{

OpenParrot/src/Functions/WindowedDxgi.cpp

@@ -241,7 +241,7 @@ extern linb::ini config;
 
 static InitFunction initFunc([]()
 {
-	if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok)
+	if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok || GameDetect::currentGame == GameID::TER)
 		return;
 	if (ToBool(config["General"]["Windowed"]))
 	{

OpenParrot/src/Utility/GameDetect.cpp

@@ -474,6 +474,9 @@ void GameDetect::DetectCurrentGame()
 		case 0x80ebd207:
 			currentGame = GameID::Theatrhythm;
 			break;
+		case 0xdb9c3a90:
+			currentGame = GameID::TER;
+			break;
 #endif
 		default:
 #ifdef _DEBUG

OpenParrot/src/Utility/GameID.h

@@ -59,5 +59,6 @@ enum class GameID
 	FNFSB2,
 	GHA,
 	JLeague,
-	Theatrhythm
+	Theatrhythm,
+	TER
 };