From 4719aeb0d25db9b2f4cfd732b3c0296700f4e1ee Mon Sep 17 00:00:00 2001
From: Cainan <cainancorlett@outlook.com>
Date: Sun, 27 Jun 2021 01:54:31 +0100
Subject: [PATCH] adds goonya fighter and puyo puyo

honestly not sure if ive done this right - especially on the apm3.cpp side of things
---
 OpenParrot/src/Functions/Games/APM3/APM3.cpp | 15 +++++++++++++++
 OpenParrot/src/Utility/GameDetect.cpp        | 16 +++++++++++-----
 OpenParrot/src/Utility/GameID.h              |  4 +++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/OpenParrot/src/Functions/Games/APM3/APM3.cpp b/OpenParrot/src/Functions/Games/APM3/APM3.cpp
index 3d7911b..dade5af 100644
--- a/OpenParrot/src/Functions/Games/APM3/APM3.cpp
+++ b/OpenParrot/src/Functions/Games/APM3/APM3.cpp
@@ -1040,5 +1040,20 @@ static InitFunction initVF5Func([]()
 		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
 	}, GameID::VF5Esports);
+	
+static InitFunction initGoonyaFunc([]()
+	{
+		HookAPM3();
+		strcpy(APM3GameId, "SDGX");
+		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
+	}, GameID::GoonyaFighter);
+	
+static InitFunction initPuyoFunc([]()
+	{
+		HookAPM3();
+		strcpy(APM3GameId, "SDFF");
+		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
+
+	}, GameID::PuyoPuyoEsports);
 #endif
\ No newline at end of file
diff --git a/OpenParrot/src/Utility/GameDetect.cpp b/OpenParrot/src/Utility/GameDetect.cpp
index 4f6f104..4f6e983 100644
--- a/OpenParrot/src/Utility/GameDetect.cpp
+++ b/OpenParrot/src/Utility/GameDetect.cpp
@@ -646,10 +646,17 @@ void GameDetect::DetectCurrentGame()
 			break;
 		case 0x0f98a7a2:
 			currentGame = GameID::Pengoe5;
-			break;
-		case 0x6fc27eed:
+			break;
+		case 0x6fc27eed: // Original
+		case 0x3b3fc3ab: // Other exe
 			currentGame = GameID::VF5Esports;
 			break;
+		case 0x1ab0f981:
+			currentGame = GameID::GoonyaFighter;
+			break;
+		case 0x8c30fa5a:
+			currentGame = GameID::PuyoPuyoEsports;
+			break;
 #endif
 		default:
 #ifdef _DEBUG
@@ -658,9 +665,8 @@ void GameDetect::DetectCurrentGame()
 			info(true, "---------------------------------");
 #else
 			memset(errorBuffer, 0, 256);
-			sprintf_s(errorBuffer, 256, "NEW CRC: %08X", newCrcResult);
-			WritePrivateProfileStringA("Error", "Unsupported Executable", errorBuffer, ".\\teknoparrot.ini");
-			MessageBoxA(0, errorBuffer, "Unsupported Executable", MB_ICONERROR);
+			sprintf_s(errorBuffer, 256, "Unsupported Executable, NEW CRC: %08X!", newCrcResult);
+			MessageBoxA(0, errorBuffer, "Error", MB_ICONERROR);
 			ExitProcess(0);
 #endif
 			break;
diff --git a/OpenParrot/src/Utility/GameID.h b/OpenParrot/src/Utility/GameID.h
index a71fd6a..686a121 100644
--- a/OpenParrot/src/Utility/GameID.h
+++ b/OpenParrot/src/Utility/GameID.h
@@ -99,5 +99,7 @@ enum class GameID
 	RadikalBikers,
 	Pengoe5,
     Pengoe5_Test,
-    VF5Esports
+    VF5Esports,
+	GoonyaFighter,
+	PuyoPuyoEsports
 };
\ No newline at end of file