diff --git a/OpenParrot/src/Functions/Games/APM3/APM3.cpp b/OpenParrot/src/Functions/Games/APM3/APM3.cpp index 280ab72..5caf31c 100644 --- a/OpenParrot/src/Functions/Games/APM3/APM3.cpp +++ b/OpenParrot/src/Functions/Games/APM3/APM3.cpp @@ -1180,6 +1180,14 @@ static InitFunction initFuncAleste11([]() }, GameID::Aleste11); +static InitFunction initFuncGGXRd([]() + { + HookAPM3(L"SDFB"); + + DWORD_PTR mainModuleBase = (DWORD_PTR)GetModuleHandle(0); + + }, GameID::GGXRd); + static InitFunction initFuncCottonRocknRollA([]() { HookAPM3(L"SDHW"); @@ -1197,4 +1205,14 @@ static InitFunction initFuncCottonRocknRollA([]() }, GameID::CottonRocknRollA); +static InitFunction initFuncBlazBlueCrossTagBattle([]() + { + HookAPM3(L"SDFU"); + + Credit_getCreditReturnValue = 3; + + DWORD_PTR mainModuleBase = (DWORD_PTR)GetModuleHandle(0); + + }, GameID::BlazBlueCrossTagBattle); + #endif diff --git a/OpenParrot/src/Functions/Games/APM3/Aime.cpp b/OpenParrot/src/Functions/Games/APM3/Aime.cpp index a4d6054..bb4d81a 100644 --- a/OpenParrot/src/Functions/Games/APM3/Aime.cpp +++ b/OpenParrot/src/Functions/Games/APM3/Aime.cpp @@ -4,6 +4,8 @@ #include "Functions\Global.h" #include "Aime.h" +bool Aime_isDBAliveReturnValue = true; + bool CALLPLEB Aime_acceptConfirm() { #ifdef _LOGAPM3AIME diff --git a/OpenParrot/src/Functions/Games/APM3/Aime.h b/OpenParrot/src/Functions/Games/APM3/Aime.h index 7d9ea7e..ebd0ede 100644 --- a/OpenParrot/src/Functions/Games/APM3/Aime.h +++ b/OpenParrot/src/Functions/Games/APM3/Aime.h @@ -53,4 +53,6 @@ enum class AIME_LOG_STATUS bool CALLPLEB Aime_sendLog(unsigned int uid, AIME_LOG_STATUS status, DWORD_PTR count); bool CALLPLEB Aime_setLedError(); bool CALLPLEB Aime_setLedSuccess(); -bool CALLPLEB Aime_start(); \ No newline at end of file +bool CALLPLEB Aime_start(); + +extern bool Aime_isDBAliveReturnValue; \ No newline at end of file diff --git a/OpenParrot/src/Functions/Games/APM3/Auth.cpp b/OpenParrot/src/Functions/Games/APM3/Auth.cpp index bc9e6cb..8286fa5 100644 --- a/OpenParrot/src/Functions/Games/APM3/Auth.cpp +++ b/OpenParrot/src/Functions/Games/APM3/Auth.cpp @@ -16,11 +16,11 @@ DWORD_PTR AllnetAccounting_beginPlayReturnValue = 0; DWORD_PTR AllnetAccounting_endPlayReturnValue = 0; DWORD_PTR AllnetAuth_getCountryCodeReturnValue = 0; DWORD_PTR AllnetAuth_getLocationIdReturnValue = 0; -int AllnetAuth_getLocationNicknamePartCountReturnValue = 0; +int AllnetAuth_getLocationNicknamePartCountReturnValue = 1; DWORD_PTR AllnetAuth_getRegionCodeReturnValue = 0; int AllnetAuth_getRegionNamePartCountReturnValue = 0; bool AllnetAuth_isDevelopReturnValue = false; -bool AllnetAuth_isGoodReturnValue = false; +bool AllnetAuth_isGoodReturnValue = true; DWORD_PTR CALLPLEB AllnetAccounting_beginPlay(unsigned int a1) { @@ -133,5 +133,5 @@ bool CALLPLEB AllnetAuth_isGood() #ifdef _LOGAPM3AUTH info(true, "AllnetAuth_isGood"); #endif - return true; + return AllnetAuth_isGoodReturnValue; } diff --git a/OpenParrot/src/Functions/Games/TypeX2/DirectInputWrapper.cpp b/OpenParrot/src/Functions/Games/TypeX2/DirectInputWrapper.cpp index f18dca1..17812d8 100644 --- a/OpenParrot/src/Functions/Games/TypeX2/DirectInputWrapper.cpp +++ b/OpenParrot/src/Functions/Games/TypeX2/DirectInputWrapper.cpp @@ -385,7 +385,8 @@ static InitFunction initFunc([]() || GameDetect::currentGame == GameID::FNFSB2 || GameDetect::currentGame == GameID::JLeague || GameDetect::currentGame == GameID::VF5Esports - || GameDetect::currentGame == GameID::VF5EsportsTest) + || GameDetect::currentGame == GameID::VF5EsportsTest + || GameDetect::currentGame == GameID::BlazBlueCrossTagBattle) return; MH_Initialize(); diff --git a/OpenParrot/src/Utility/GameDetect.cpp b/OpenParrot/src/Utility/GameDetect.cpp index 236f0a2..86da7c4 100644 --- a/OpenParrot/src/Utility/GameDetect.cpp +++ b/OpenParrot/src/Utility/GameDetect.cpp @@ -637,6 +637,16 @@ void GameDetect::DetectCurrentGame() case 0xd426de40: // Cotton Rock n Roll A SetGameId(GameID::CottonRocknRollA, "Cotton Rock n Roll A"); break; + case 0xed8af9f8: // Guilty Gear Xrd REV APM3 Edition + SetGameId(GameID::GGXRd, "Guilty Gear Xrd REV APM3 Edition"); + break; + case 0x817d4c50: + case 0x5883e93d: + case 0x4471e6a0: + case 0x5bc0c88b: + case 0xb1cb5260: + SetGameId(GameID::BlazBlueCrossTagBattle, "BLAZBLUE CROSS TAG BATTLE"); + break; #endif #ifdef _AMD64_ case 0xf322d053: diff --git a/OpenParrot/src/Utility/GameID.h b/OpenParrot/src/Utility/GameID.h index 26028ed..3411f87 100644 --- a/OpenParrot/src/Utility/GameID.h +++ b/OpenParrot/src/Utility/GameID.h @@ -128,5 +128,7 @@ enum class GameID CottonRocknRollA, CottonRocknRollATest, NosferatuLilinor, - Kasiori + Kasiori, + GGXRd, + BlazBlueCrossTagBattle }; \ No newline at end of file