diff --git a/MK11Hook/MK11Hook.vcxproj b/MK11Hook/MK11Hook.vcxproj
index 39fefdc..b166ea4 100644
--- a/MK11Hook/MK11Hook.vcxproj
+++ b/MK11Hook/MK11Hook.vcxproj
@@ -21,13 +21,13 @@
DynamicLibrary
true
- v142
+ v143
MultiByte
DynamicLibrary
false
- v142
+ v143
true
MultiByte
diff --git a/MK11Hook/code/CharacterDefinition.cpp b/MK11Hook/code/CharacterDefinition.cpp
index 05887f9..f9bb768 100644
--- a/MK11Hook/code/CharacterDefinition.cpp
+++ b/MK11Hook/code/CharacterDefinition.cpp
@@ -7,22 +7,22 @@
void CharacterDefinition::Set(const char* name, int64 loadout, int64 unk)
{
- ((void(__fastcall*)(CharacterDefinition*, const char*, int64, int64))_addr(0x140598AB0))(this, name, loadout, unk);
+ ((void(__fastcall*)(CharacterDefinition*, const char*, int64, int64))_addr(0x14059C950))(this, name, loadout, unk);
}
void CharacterDefinition::SetLevel(int level)
{
- ((void(__fastcall*)(CharacterDefinition*, int))_addr(0x140599F80))(this, level);
+ ((void(__fastcall*)(CharacterDefinition*, int))_addr(0x14059DE20))(this, level);
}
void CharacterDefinition::SetAlternatePalette(bool set)
{
- ((void(__fastcall*)(CharacterDefinition*, int))_addr(0x14059E5E0))(this, set);
+ ((void(__fastcall*)(CharacterDefinition*, int))_addr(0x1405A2480))(this, set);
}
void CharacterDefinition::SetLoadout(int64 loadout)
{
- ((void(__fastcall*)(CharacterDefinition*, int64))_addr(0x14059A0B0))(this, loadout);
+ ((void(__fastcall*)(CharacterDefinition*, int64))_addr(0x14059DF50))(this, loadout);
}
//void CharacterLoadout::EquipItem(GearItem* item)
diff --git a/MK11Hook/code/GameInfo.cpp b/MK11Hook/code/GameInfo.cpp
index 8ed3858..8a073d6 100644
--- a/MK11Hook/code/GameInfo.cpp
+++ b/MK11Hook/code/GameInfo.cpp
@@ -4,10 +4,10 @@
MKScript* GetScript(const char* name)
{
- int64 package = ((int64(__fastcall*)(const char*))_addr(0x140941B20))("MainlineManaged.SystemPackages.FightingArt");
+ int64 package = ((int64(__fastcall*)(const char*))_addr(0x14094A1B0))("MainlineManaged.SystemPackages.FightingArt");
if (package)
{
- MKScript* script = ((MKScript*(__fastcall*)(int64, const char*, int,int,int))_addr(0x140EA8830))(package,name,1,1,0);
+ MKScript* script = ((MKScript*(__fastcall*)(int64, const char*, int,int,int))_addr(0x140EC2190))(package,name,1,1,0);
return script;
}
@@ -16,7 +16,7 @@ MKScript* GetScript(const char* name)
int64 GetScriptVar(MKScript* script, const char* name)
{
- return ((int64(__fastcall*)(MKScript*, const char*, int))_addr(0x14114F750))(script, name, 1);
+ return ((int64(__fastcall*)(MKScript*, const char*, int))_addr(0x141169AC0))(script, name, 1);
}
FGGameInfo* GetGameInfo()
@@ -31,31 +31,31 @@ int GetGameState()
void FGGameInfo::SetStage(const char* stage)
{
- ((void(__thiscall*)(FGGameInfo*, const char*))_addr(0x14059A460))(this, stage);
+ ((void(__thiscall*)(FGGameInfo*, const char*))_addr(0x14059E300))(this, stage);
}
void FGGameInfo::ResetStageInteractables()
{
int64 bgnd_info = *(int64*)(this + 80);
- ((void(__fastcall*)(int64))_addr(0x14045C5C0))(bgnd_info);
- ((void(__fastcall*)(int64))_addr(0x14045CB00))(bgnd_info);
- ((void(__fastcall*)(int64))_addr(0x14045C530))(bgnd_info);
+ ((void(__fastcall*)(int64))_addr(0x140460290))(bgnd_info);
+ ((void(__fastcall*)(int64))_addr(0x1404607D0))(bgnd_info);
+ ((void(__fastcall*)(int64))_addr(0x140460200))(bgnd_info);
}
PlayerInfo* FGGameInfo::GetInfo(PLAYER_NUM plr)
{
- return ((PlayerInfo*(__fastcall*)(FGGameInfo*, PLAYER_NUM))_addr(0x14056F8F0))(this, plr);
+ return ((PlayerInfo*(__fastcall*)(FGGameInfo*, PLAYER_NUM))_addr(0x1405736C0))(this, plr);
}
int MKScript::GetFunctionID(int hash)
{
- return ((int(__thiscall*)(MKScript*, int, int))_addr(0x14114C5F0))(this, hash, 0);
+ return ((int(__thiscall*)(MKScript*, int, int))_addr(0x141166960))(this, hash, 0);
}
int64 MKScript::GetVar(const char* name)
{
- return ((int64(__fastcall*)(MKScript*, const char*, int))_addr(0x14114F750))(this, name, 1);
+ return ((int64(__fastcall*)(MKScript*, const char*, int))_addr(0x141169AC0))(this, name, 1);
}
unsigned int MKScript::GetCurrentFunc()
diff --git a/MK11Hook/code/Krypt.cpp b/MK11Hook/code/Krypt.cpp
index 83cac23..5cd80a1 100644
--- a/MK11Hook/code/Krypt.cpp
+++ b/MK11Hook/code/Krypt.cpp
@@ -3,10 +3,10 @@
MKObject* Krypt::GetKryptPlayer(int value)
{
- return ((MKObject*(__fastcall*)(Krypt*, int))_addr(0x140985370))(this, value);
+ return ((MKObject*(__fastcall*)(Krypt*, int))_addr(0x14098DA20))(this, value);
}
Krypt* GetKrypt()
{
- return ((Krypt*(__fastcall*)(int))_addr(0x140985210))(1);
+ return ((Krypt*(__fastcall*)(int))_addr(0x14098D8C0))(1);
}
diff --git a/MK11Hook/code/MKCharacter.cpp b/MK11Hook/code/MKCharacter.cpp
index 0382d2e..f994b95 100644
--- a/MK11Hook/code/MKCharacter.cpp
+++ b/MK11Hook/code/MKCharacter.cpp
@@ -7,33 +7,33 @@
void MKCharacter::SetLife(float life)
{
- ((void(__fastcall*)(MKCharacter*, float))_addr(0x1404C8830))(this, life);
+ ((void(__fastcall*)(MKCharacter*, float))_addr(0x1404CC300))(this, life);
}
void MKCharacter::SetScale(FVector * scale)
{
- ((void(__fastcall*)(MKCharacter*, FVector*))_addr(0x1411608B0))(this, scale);
+ ((void(__fastcall*)(MKCharacter*, FVector*))_addr(0x14117AC20))(this, scale);
}
void MKCharacter::SetSpeed(float speed)
{
- ((void(__fastcall*)(MKCharacter*, float))_addr(0x1404C4510))(this, speed);
+ ((void(__fastcall*)(MKCharacter*, float))_addr(0x1404C7FE0))(this, speed);
}
void MKCharacter::SetEasyKrushingBlows(bool enable)
{
- ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404C7970))(this, enable, 1);
+ ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404CB440))(this, enable, 1);
}
void MKCharacter::SetInfiniteKrushingBlows(bool enable)
{
- ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404CABD0))(this, enable, 1);
+ ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404CE6A0))(this, enable, 1);
}
void MKCharacter::SetFastUppercutRecovery(bool enable)
{
- ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404C9770))(this, enable, 1);
+ ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404CD240))(this, enable, 1);
}
int MKCharacter::GetAbility()
@@ -54,7 +54,7 @@ void MKCharacter::SetAbility(unsigned int id)
void MKCharacter::SetCombos(bool enable)
{
- ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404C7300))(this, enable, 1);
+ ((void(__fastcall*)(MKCharacter*, int, int))_addr(0x1404CADD0))(this, enable, 1);
}
float MKCharacter::GetLife()
@@ -69,35 +69,35 @@ void MKCharacter::ClearAbilities()
void MKCharacter::ActivateHeadTracking()
{
- ((void(__fastcall*)(MKCharacter*, float))_addr(0x140DC05C0))(this, 0.5);
+ ((void(__fastcall*)(MKCharacter*, float))_addr(0x140DD9030))(this, 0.5);
}
void MKCharacter::KillHeadTracking()
{
- ((void(__fastcall*)(MKCharacter*, float))_addr(0x140DC0590))(this, 0.5);
+ ((void(__fastcall*)(MKCharacter*, float))_addr(0x140DD9000))(this, 0.5);
}
void MKCharacter::SetBoneSize(const char * name, float size)
{
FName fname(name, FNAME_Add, 1);
- ((void(__fastcall*)(int64, FName*, float))_addr(0x141A30590))(*(int64*)((int64)this + 0x250), &fname, size);
+ ((void(__fastcall*)(int64, FName*, float))_addr(0x141A39B30))(*(int64*)((int64)this + 0x250), &fname, size);
}
void MKCharacter::GetBonePos(const char * name, FVector * pos)
{
FName fname(name, FNAME_Add, 1);
- ((void(__fastcall*)(MKCharacter*, FName, FVector*))_addr(0x140DB9BF0))(this, fname, pos);
+ ((void(__fastcall*)(MKCharacter*, FName, FVector*))_addr(0x140DD2660))(this, fname, pos);
}
void MKCharacter::GetBoneRot(const char * name, FRotator * rot)
{
FName fname(name, FNAME_Add, 1);
- ((void(__fastcall*)(MKCharacter*, FName, FRotator*))_addr(0x1404A5550))(this, fname, rot);
+ ((void(__fastcall*)(MKCharacter*, FName, FRotator*))_addr(0x1404A9220))(this, fname, rot);
}
void MKCharacter::ExecuteScript(MKScript* script, int function)
{
- ((void(__thiscall*)(MKCharacter*, MKScript*, int, int))_addr(0x1404D1CC0))(this, script, function, 1);
+ ((void(__thiscall*)(MKCharacter*, MKScript*, int, int))_addr(0x1404D5790))(this, script, function, 1);
}
MKScript* MKCharacter::GetMyScript()
diff --git a/MK11Hook/code/MKModifier.cpp b/MK11Hook/code/MKModifier.cpp
index b7de7b4..609993c 100644
--- a/MK11Hook/code/MKModifier.cpp
+++ b/MK11Hook/code/MKModifier.cpp
@@ -3,51 +3,25 @@
TagAssistModifier::TagAssistModifier(const char * character)
{
- ((void(__fastcall*)(BaseModifier*,const char*, int))_addr(0x140545F90))(this, character, 0);
+ ((void(__fastcall*)(BaseModifier*,const char*, int))_addr(0x140549D20))(this, character, 0);
}
void TagAssistModifier::Activate(PlayerInfo* info)
{
- //140558320
- ((void(__fastcall*)(BaseModifier*, PlayerInfo*))_addr(0x140558AE0))(this, info);
+ ((void(__fastcall*)(BaseModifier*, PlayerInfo*))_addr(0x14055C8B0))(this, info);
}
TagAssistModifierObject * TagAssistModifier::CreateObject()
{
- return ((TagAssistModifierObject*(__fastcall*)(BaseModifier*))_addr(0x140560BE0))(this);
+ return ((TagAssistModifierObject*(__fastcall*)(BaseModifier*))_addr(0x1405649B0))(this);
}
void MKModifier::ActivateModifier(BaseModifier * modifier, MKCharacter * obj)
{
- ((void(__fastcall*)(MKModifier*, BaseModifier*, MKCharacter*))_addr(0x140B85ED0))(this, modifier, obj);
+ ((void(__fastcall*)(MKModifier*, BaseModifier*, MKCharacter*))_addr(0x140B9C5B0))(this, modifier, obj);
}
void TagAssistModifierObject::Activate(MKCharacter* obj)
{
- ((void(__fastcall*)(TagAssistModifierObject*, MKCharacter*))_addr(0x140558960))(this, obj);
-}
-
-Modifier::Modifier(const char* character,int a3, int a4, char* a5)
-{
- ((void(__fastcall*)(BaseModifier*, const char*, int, int, char*))_addr(0x140542610))(this, character, a3, a4, a5);
-}
-
-void Modifier::Activate(MKCharacter* who)
-{
- ((void(__fastcall*)(BaseModifier*, MKCharacter*))_addr(0x1405586E0))(this, who);
-}
-
-ModifierAssist::ModifierAssist(const char* name, int a3, int a4, char* a5)
-{
- ((void(__fastcall*)(ModifierAssist*, const char*, int, int, char*))_addr(0x140542230))(this, name, a3, a4, a5);
-}
-
-ModifierAssistObject* ModifierAssist::CreateObject()
-{
- return ((ModifierAssistObject* (__fastcall*)(BaseModifier*))_addr(0x1405608F0))(this);
-}
-
-void ModifierAssistObject::Activate(MKCharacter* obj)
-{
- ((void(__fastcall*)(ModifierAssistObject*,MKCharacter*))_addr(0x1405581A0))(this, obj);
-}
+ ((void(__fastcall*)(TagAssistModifierObject*, MKCharacter*))_addr(0x14055C730))(this, obj);
+}
\ No newline at end of file
diff --git a/MK11Hook/code/MKModifier.h b/MK11Hook/code/MKModifier.h
index b1296ab..c48da66 100644
--- a/MK11Hook/code/MKModifier.h
+++ b/MK11Hook/code/MKModifier.h
@@ -20,25 +20,6 @@ class TagAssistModifier : public BaseModifier {
TagAssistModifierObject* CreateObject();
};
-
-class Modifier : public BaseModifier {
-public:
- Modifier(const char* character, int a3, int a4, char* a5);
- void Activate(MKCharacter* who);
-};
-
-class ModifierAssistObject {
-public:
- void Activate(MKCharacter* obj);
-};
-
-
-class ModifierAssist : public BaseModifier {
-public:
- ModifierAssist(const char* name, int a3, int a4, char* a5);
- ModifierAssistObject* CreateObject();
-};
-
class MKModifier {
public:
void ActivateModifier(BaseModifier* modifier, MKCharacter* obj);
diff --git a/MK11Hook/code/MKObject.cpp b/MK11Hook/code/MKObject.cpp
index 0a7579a..1f90bad 100644
--- a/MK11Hook/code/MKObject.cpp
+++ b/MK11Hook/code/MKObject.cpp
@@ -5,10 +5,10 @@
void MKObject::SetPos(FVector* pos)
{
- ((void(__fastcall*)(MKObject*, FVector*))_addr(0x14115E910))(this, pos);
+ ((void(__fastcall*)(MKObject*, FVector*))_addr(0x141178C80))(this, pos);
}
void MKObject::GetPos(FVector* dest)
{
- ((void(__fastcall*)(MKObject*, FVector*))_addr(0x14114F8A0))(this, dest);
+ ((void(__fastcall*)(MKObject*, FVector*))_addr(0x141169C10))(this, dest);
}
diff --git a/MK11Hook/code/PlayerInfo.cpp b/MK11Hook/code/PlayerInfo.cpp
index 73e3f8c..389ce99 100644
--- a/MK11Hook/code/PlayerInfo.cpp
+++ b/MK11Hook/code/PlayerInfo.cpp
@@ -6,7 +6,7 @@
void PlayerInfo::SetMeter(eMeterValues type, float value)
{
- ((void(__fastcall*)(PlayerInfo*, int, float))_addr(0x1405FABE0))(this, type, value);
+ ((void(__fastcall*)(PlayerInfo*, int, float))_addr(0x1405FEE50))(this, type, value);
}
void PlayerInfo::SetDamageMult(float value)
@@ -18,7 +18,7 @@ void PlayerInfo::SetDamageMult(float value)
void PlayerInfo::RefreshMeter(bool value)
{
- ((void(__fastcall*)(PlayerInfo*, bool))_addr(0x140602930))(this,value);
+ ((void(__fastcall*)(PlayerInfo*, bool))_addr(0x140606BA0))(this,value);
}
float PlayerInfo::GetMeter(eMeterValues type)
@@ -34,10 +34,10 @@ HitCounter PlayerInfo::GetHits()
AIDrone* PlayerInfo::GetDrone()
{
- return ((AIDrone*(__fastcall*)(PlayerInfo*))_addr(0x1405E4C70))(this);
+ return ((AIDrone*(__fastcall*)(PlayerInfo*))_addr(0x1405E8FE0))(this);
}
void AIDrone::Set(const char* script, int unk)
{
- ((void(__fastcall*)(AIDrone*, const char*, int))_addr(0x14042AA70))(this, script, unk);
+ ((void(__fastcall*)(AIDrone*, const char*, int))_addr(0x14042E640))(this, script, unk);
}
diff --git a/MK11Hook/code/mk11.cpp b/MK11Hook/code/mk11.cpp
index c264bad..c2aad23 100644
--- a/MK11Hook/code/mk11.cpp
+++ b/MK11Hook/code/mk11.cpp
@@ -256,7 +256,7 @@ void __fastcall MK11Hooks::HookProcessStuff()
TheMenu->RunBrutalityWatcher();
}
- ((void(__fastcall*)())_addr(0x141152BE0))();
+ ((void(__fastcall*)())_addr(0x14116CF50))();
}
void __fastcall MK11Hooks::HookStartupFightRecording(int64 eventID, int64 a2, int64 a3, int64 a4)
@@ -313,20 +313,14 @@ void __fastcall MK11Hooks::HookStartupFightRecording(int64 eventID, int64 a2, in
printf("MK11Hook::Info() | %s VS %s\n", GetCharacterName(PLAYER1), GetCharacterName(PLAYER2));
- ((void(__fastcall*)(int64, int64, int64, int64))_addr(0x141158B70))(eventID, a2, a3, a4);
+ ((void(__fastcall*)(int64, int64, int64, int64))_addr(0x141172EE0))(eventID, a2, a3, a4);
}
-void MK11Hooks::HookPreFightStart()
-{
- ((void(__fastcall*)())_addr(0x140CFBAB0))();
-}
-
-
int64 MK11Hooks::HookSetProperty(int64 ptr, char * name, int64 unk)
{
hud_property = ptr;
- return ((int64(__fastcall*)(int64, char*, int64))_addr(0x141A6B2D0))(ptr, name, unk);
+ return ((int64(__fastcall*)(int64, char*, int64))_addr(0x141A76DF0))(ptr, name, unk);
}
void MK11Hooks::HookReadPropertyValue(int64 ptr, int* unk, int* value)
@@ -357,7 +351,7 @@ void MK11Hooks::HookDispatch(int64 ptr, int a2)
((void(*)(int64, int))*(int64*)(arg + 0xD8))(ptr, a2);
}
else
- ((int64(__fastcall*)(int64, int))_addr(0x141171F80))(ptr, a2);
+ ((int64(__fastcall*)(int64, int))_addr(0x14118C2F0))(ptr, a2);
}
@@ -407,7 +401,7 @@ void MK11Hooks::HookSetLadderScreen(CharacterDefinition* chr, char * name, int64
MKCharacter* GetObj(PLAYER_NUM plr)
{
- return ((MKCharacter*(__fastcall*)(PLAYER_NUM))_addr(0x1408F8F60))(plr);
+ return ((MKCharacter*(__fastcall*)(PLAYER_NUM))_addr(0x1408FCB00))(plr);
}
PlayerInfo* GetInfo(PLAYER_NUM plr)
@@ -419,17 +413,17 @@ void GetCharacterPosition(FVector * vec, PLAYER_NUM plr)
{
int64 object = (int64)GetObj(plr);
if (object)
- ((int64(__fastcall*)(int64, FVector*))_addr(0x14114F8A0))(object, vec);
+ ((int64(__fastcall*)(int64, FVector*))_addr(0x141169C10))(object, vec);
}
void HideHUD()
{
- ((void(__fastcall*)(int, int))_addr(0x1408F59B0))(8, 8);
+ ((void(__fastcall*)(int, int))_addr(0x1408F9550))(8, 8);
}
void ShowHUD()
{
- ((void(__fastcall*)(int, int))_addr(0x1408F62F0))(8, 8);
+ ((void(__fastcall*)(int, int))_addr(0x1408F9E90))(8, 8);
}
void SetCharacterMKX(PLAYER_NUM plr, char * name)
@@ -451,7 +445,7 @@ char * GetCharacterName(PLAYER_NUM plr)
void SlowGameTimeForXTicks(float speed, int ticks)
{
- ((void(__fastcall*)(float, int, int))_addr(0x1405C0A10))(speed, ticks, 0);
+ ((void(__fastcall*)(float, int, int))_addr(0x1405C4B00))(speed, ticks, 0);
}
@@ -462,31 +456,31 @@ void SetKryptCharacter(int64 ptr, char * name)
printf("MK11Hook::SetKryptCharacter() | Loading character %s\n", name);
- ((void(__fastcall*)(int64, char*))_addr(0x1408221E0))(ptr, name);
+ ((void(__fastcall*)(int64, char*))_addr(0x140825D80))(ptr, name);
}
void SetKryptCharacterL(int64 ptr, char * name, int unk)
{
- ((void(__fastcall*)(int64, char*, int))_addr(0x141A696E0))(ptr, name, unk);
+ ((void(__fastcall*)(int64, char*, int))_addr(0x141A75200))(ptr, name, unk);
}
void SetKryptCharacterClass(int64 ptr, char * name, int unk)
{
if (TheMenu->m_bKryptModifier)
name = TheMenu->szCurrentKryptCharacterClass;
- ((void(__fastcall*)(int64, char*, int))_addr(0x142395AD0))(ptr, name, unk);
+ ((void(__fastcall*)(int64, char*, int))_addr(0x1423AD600))(ptr, name, unk);
}
MKModifier* GetModifierManager()
{
- int64 info = ((int64(__fastcall*)())_addr(0x140679BC0))();
- return ((MKModifier*(__fastcall*)(int64))_addr(0x14067B790))(info);
+ int64 info = ((int64(__fastcall*)())_addr(0x14067D7A0))();
+ return ((MKModifier*(__fastcall*)(int64))_addr(0x14067F370))(info);
}
void LoadModifierAssets()
{
int64 gameinfo = *(__int64*)_addr(GFG_GAME_INFO);
- ((void(__fastcall*)(int64, bool))_addr(0x14057DD50))(gameinfo, 1);
+ ((void(__fastcall*)(int64, bool))_addr(0x140581B20))(gameinfo, 1);
}
diff --git a/MK11Hook/code/mk11.h b/MK11Hook/code/mk11.h
index 5e7c730..7e8f075 100644
--- a/MK11Hook/code/mk11.h
+++ b/MK11Hook/code/mk11.h
@@ -7,10 +7,10 @@
#include "PlayerInfo.h"
#include "CharacterDefinition.h"
-#define GFG_GAME_INFO 0x143498D90
+#define GFG_GAME_INFO 0x1434BA060
-#define MK11HOOK_VERSION "0.5.4"
+#define MK11HOOK_VERSION "0.5.4-update"
#define TOTAL_ABILITIES 20
@@ -58,7 +58,6 @@ namespace MK11Hooks {
// hooks
void HookProcessStuff();
void HookStartupFightRecording(int64 eventID, int64 a2, int64 a3, int64 a4);
- void HookPreFightStart();
void HookReadPropertyValue(int64 ptr, int* unk, int* value);
int64 HookSetProperty(int64 ptr, char* name, int64 unk);
diff --git a/MK11Hook/code/mk11menu.cpp b/MK11Hook/code/mk11menu.cpp
index 4a2719d..01d393c 100644
--- a/MK11Hook/code/mk11menu.cpp
+++ b/MK11Hook/code/mk11menu.cpp
@@ -1232,7 +1232,7 @@ void MK11Menu::DrawModifiersTab()
sprintf(szPlayer1Bone, szBones[n]);
if (is_selected)
ImGui::SetItemDefaultFocus();
-
+
}
ImGui::EndCombo();
}
diff --git a/MK11Hook/code/mkcamera.cpp b/MK11Hook/code/mkcamera.cpp
index 6fcba6a..41aea54 100644
--- a/MK11Hook/code/mkcamera.cpp
+++ b/MK11Hook/code/mkcamera.cpp
@@ -10,14 +10,14 @@ void MKCamera::SetPosition(FVector * pos)
{
TheCamera = this;
camPos = *pos;
- ((void(__fastcall*)(MKCamera*, FVector*))_addr(0x141A11870))(this, pos);
+ ((void(__fastcall*)(MKCamera*, FVector*))_addr(0x141A3B180))(this, pos);
}
void MKCamera::SetRotation(FRotator * rot)
{
TheCamera = this;
camRot = *rot;
- ((void(__fastcall*)(MKCamera*, FRotator*))_addr(0x141A12250))(this, rot);
+ ((void(__fastcall*)(MKCamera*, FRotator*))_addr(0x141A3C190))(this, rot);
}
void MKCamera::SetFOV(float FOV)
diff --git a/MK11Hook/code/unreal/FName.cpp b/MK11Hook/code/unreal/FName.cpp
index 8080f93..e117963 100644
--- a/MK11Hook/code/unreal/FName.cpp
+++ b/MK11Hook/code/unreal/FName.cpp
@@ -3,5 +3,5 @@
FName::FName(const char * Name, EFindName FindType, int formal)
{
- ((void(__fastcall*)(FName*, const char*, EFindName, int))_addr(0x141A696E0))(this, Name, FindType, formal);
+ ((void(__fastcall*)(FName*, const char*, EFindName, int))_addr(0x141A75200))(this, Name, FindType, formal);
}
diff --git a/MK11Hook/dllmain.cpp b/MK11Hook/dllmain.cpp
index 507e7e8..eaa0a94 100644
--- a/MK11Hook/dllmain.cpp
+++ b/MK11Hook/dllmain.cpp
@@ -36,46 +36,47 @@ void OnInitializeHook()
Notifications->Init();
Trampoline* tramp = Trampoline::MakeTrampoline(GetModuleHandle(nullptr));
- InjectHook(_addr(0x14092BC93), tramp->Jump(MK11Hooks::HookProcessStuff));
- InjectHook(_addr(0x14090D3B3), tramp->Jump(MK11Hooks::HookStartupFightRecording));
- InjectHook(_addr(0x14090E4D8), tramp->Jump(MK11Hooks::HookPreFightStart));
+ InjectHook(_addr(0x1409312C3), tramp->Jump(MK11Hooks::HookProcessStuff));
+ InjectHook(_addr(0x140910F53), tramp->Jump(MK11Hooks::HookStartupFightRecording));
- Nop(_addr(0x1419A88F3), 7);
- Nop(_addr(0x1419A8903), 8);
- InjectHook(_addr(0x1419A8911), tramp->Jump(&MKCamera::HookedSetPosition));
- InjectHook(_addr(0x1419A891E), tramp->Jump(&MKCamera::HookedSetRotation));
+ // 0xFE00
+ Nop(_addr(0x1419B86F3), 7);
+ Nop(_addr(0x1419B8703), 8);
+ InjectHook(_addr(0x1419B8711), tramp->Jump(&MKCamera::HookedSetPosition));
+ InjectHook(_addr(0x1419B871E), tramp->Jump(&MKCamera::HookedSetRotation));
- InjectHook(_addr(0x14086D970), tramp->Jump(MK11Hooks::HookSetSelectScreen), PATCH_JUMP);
- InjectHook(_addr(0x1405992AE), tramp->Jump(MK11Hooks::HookSetLadderScreen));
+ InjectHook(_addr(0x140871510), tramp->Jump(MK11Hooks::HookSetSelectScreen), PATCH_JUMP);
+ InjectHook(_addr(0x14059D14E), tramp->Jump(MK11Hooks::HookSetLadderScreen));
- InjectHook(_addr(0x140977234), tramp->Jump(SetKryptCharacter));
- InjectHook(_addr(0x14097724B), tramp->Jump(SetKryptCharacterL));
- InjectHook(_addr(0x1409772AA), tramp->Jump(SetKryptCharacterClass));
+
+ InjectHook(_addr(0x14097F8E4), tramp->Jump(SetKryptCharacter));
+ InjectHook(_addr(0x14097F8FB), tramp->Jump(SetKryptCharacterL));
+ InjectHook(_addr(0x14097F95A), tramp->Jump(SetKryptCharacterClass));
if (SettingsMgr->bMakeAllAbilities1Slot)
- InjectHook(_addr(0x1407213A0), tramp->Jump(GenericTrueReturn), PATCH_JUMP);
+ InjectHook(_addr(0x140724F40), tramp->Jump(GenericTrueReturn), PATCH_JUMP);
+
+ InjectHook(_addr(0x141A8BBF0), tramp->Jump(MK11Hooks::HookReadPropertyValue), PATCH_JUMP);
+ InjectHook(_addr(0x1412B96C8), tramp->Jump(MK11Hooks::HookSetProperty));
- InjectHook(_addr(0x141A800D0), tramp->Jump(MK11Hooks::HookReadPropertyValue), PATCH_JUMP);
- InjectHook(_addr(0x1412A0728), tramp->Jump(MK11Hooks::HookSetProperty));
-
- InjectHook(_addr(0x141B45C34), tramp->Jump(MK11Hooks::HookDispatch));
+ InjectHook(_addr(0x141B5D7E4), tramp->Jump(MK11Hooks::HookDispatch));
//gamepad
if (SettingsMgr->bEnableGamepadSupport)
- InjectHook(_addr(0x14238A761), tramp->Jump(XInputGetState_Hook), PATCH_JUMP);
+ InjectHook(_addr(0x1423A2291), tramp->Jump(XInputGetState_Hook), PATCH_JUMP);
}
bool ValidateGameVersion()
{
- char* gameName = (char*)_addr(0x142600EA8);
+ char* gameName = (char*)_addr(0x14261CEA0);
if (strcmp(gameName, "Mortal Kombat 11") == 0)
return true;