Merge pull request #198 from Hippo-Pippo/master

Update Aime.cpp

OpenParrot/src/Functions/Games/APM3/APM3.cpp

@@ -1212,6 +1212,14 @@ static InitFunction initFuncAleste11([]()
 
 }, GameID::Aleste11);
 
+static InitFunction initFuncAleste12([]()
+	{
+		HookAPM3(L"SDHB");
+
+		DWORD_PTR mainModuleBase = (DWORD_PTR)GetModuleHandle(0);
+
+}, GameID::Aleste12);
+
 BOOL WINAPI ClipCursorHook(const RECT* lpRect)
 {
 	return false;

OpenParrot/src/Functions/Games/APM3/Aime.cpp

@@ -84,7 +84,7 @@ bool CALLPLEB Aime_hasResult()
 #ifdef _LOGAPM3AIME
 	info(true, "Aime_hasResult");
 #endif
-	return true;
+	return false;
 }
 
 bool CALLPLEB Aime_isBusy()

OpenParrot/src/Utility/GameDetect.cpp

@@ -632,6 +632,9 @@ void GameDetect::DetectCurrentGame()
 		case 0xd8efb80e: // ALESTE Ver 11
 			SetGameId(GameID::Aleste11, "ALESTE Ver 11");
 			break;
+		case 0xd7597976: // ALESTE Ver 12
+			SetGameId(GameID::Aleste12, "ALESTE Ver 12");
+			break;
 		case 0xd426de40: // Cotton Rock n Roll A
 		case 0x1eedb670: // Cotton Rock n Roll A v1.2
 			SetGameId(GameID::CottonRocknRollA, "Cotton Rock n Roll A");
@@ -786,6 +789,7 @@ void GameDetect::DetectCurrentGame()
 		case 0xd0a6afbd: // GGS
 		case 0x79727b3b: // GGS 1.1
 		case 0x4fade723: // GGS 1.2
+		case 0xa3982762: // GGS 1.3
 			SetGameId(GameID::GGS, "Guilty Gear Strive");
 			break;
 		case 0x72F9B475: // 00.18

OpenParrot/src/Utility/GameID.h

@@ -120,6 +120,7 @@ enum class GameID
 	TaikoV8,
 	WMMT5DX,
 	Aleste11,
+	Aleste12,
 	CottonRocknRollA,
 	CottonRocknRollATest,
 	NosferatuLilinor,
@@ -135,4 +136,4 @@ enum class GameID
 	UnderNightAPM3Test,
 	OtoshuDX,
 	ElevatorActionDeathParade
-};
+};