1.5 hotfix 2

waiting for red4ext update
maximegmd · Feb 28, 2022 · cf21b40 · cf21b40
1 parent 6dc129d
commit cf21b40
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/src/Image.cpp b/src/Image.cpp
@@ -32,7 +32,8 @@ void Image::Initialize()
         {{0xE7, 0x28, 0xD7, 0x5D, 0xB8, 0xF9, 0x79, 0x4D, 0x89, 0x76, 0x16, 0x64, 0xAB, 0x1E, 0xA0, 0x47}, MakeVersion(1, 30)},
         {{0x8E, 0x08, 0xA2, 0x5B, 0xC7, 0xDD, 0xD5, 0x48, 0xB4, 0xE9, 0x90, 0x38, 0x15, 0xB8, 0xBB, 0xEB}, MakeVersion(1, 31)},
         {{0x5B, 0x6C, 0xAD, 0x70, 0x67, 0x2b, 0x54, 0x40, 0xBC, 0x45, 0x06, 0x60, 0x44, 0xA9, 0x12, 0x61}, MakeVersion(1, 50)},
-        {{0x73, 0x05, 0x22, 0x1B, 0x23, 0x65, 0x14, 0x4E, 0xB0, 0xE0, 0xAE, 0xC3, 0x4E, 0xD6, 0x4F, 0xBF}, MakeVersion(1, 5001)}
+        {{0x73, 0x05, 0x22, 0x1B, 0x23, 0x65, 0x14, 0x4E, 0xB0, 0xE0, 0xAE, 0xC3, 0x4E, 0xD6, 0x4F, 0xBF}, MakeVersion(1, 5001)},
+        {{0xDB, 0xE2, 0xBB, 0x94, 0x3B, 0x18, 0xB0, 0x4C, 0xAB, 0x56, 0xB6, 0xB8, 0x9A, 0x7E, 0xD2, 0xA5}, MakeVersion(1, 5002)}
     };
 
     mem::module mainModule = mem::module::main();

diff --git a/src/Image.h b/src/Image.h
@@ -6,7 +6,7 @@ struct Image
 
 	static std::tuple<uint32_t, uint16_t> GetSupportedVersion() noexcept
 	{
-        return std::make_tuple(1, 5001);
+        return std::make_tuple(1, 5002);
 	}
 
     static uint64_t MakeVersion(uint32_t aMajor, uint16_t aMinor) noexcept

diff --git a/src/reverse/Addresses.h b/src/reverse/Addresses.h
@@ -14,55 +14,55 @@ namespace CyberEngineTweaks::Addresses
 constexpr uintptr_t ImageBase = 0x140000000;
 
 #pragma region CGame
-constexpr uintptr_t CGame_Main = 0x140A6AFB0 - ImageBase; // 40 57 48 83 EC 70 48 8B F9 0F 29 7C 24 50 48 8D 4C 24 38, expected: 1, index: 0
+constexpr uintptr_t CGame_Main = 0x140A6AF60 - ImageBase; // 40 57 48 83 EC 70 48 8B F9 0F 29 7C 24 50 48 8D 4C 24 38, expected: 1, index: 0
 #pragma endregion
 
 #pragma region CPatches
-constexpr uintptr_t CPatches_BoundaryTeleport = 0x141AFFFC0 - ImageBase; // 48 8B C4 55 53 41 54 48  8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 70 10 48 8D 59 48, expected: 1, index: 0
+constexpr uintptr_t CPatches_BoundaryTeleport = 0x141AFFF40 - ImageBase; // 48 8B C4 55 53 41 54 48  8D A8 ? ? ? ? 48 81 EC ? ? ? ? 48 89 70 10 48 8D 59 48, expected: 1, index: 0
 constexpr uintptr_t CPatches_IntroMovie = 0x1401FA5B0 - ImageBase; // 48 89 5C 24 08 57 48 83 EC 20 48 8B 44 24 50 48 8B D9 48 89 41 08, expected: 1, index: 0
-constexpr uintptr_t CPatches_Vignette = 0x1411667D0 - ImageBase; // 48 8B 41 30 48 83 78 68 00 74, expected: 1, index: 0
-constexpr uintptr_t CPatches_MinimapFlicker = 0x14256869D - ImageBase; // 83 79 2C 00 48 8B F2 4C, expected: 1, index: 0
-constexpr uintptr_t CPatches_OptionsInit = 0x142B965D0 - ImageBase; // 40 53 48 83 EC 40 48 8B D9 48 8D 4C 24 20 E8 ? ? ? ? E8 ? ? ? ? 4C 8B 43 08, expected: 1, index: 0
-constexpr uintptr_t CPatches_SkipStartScreen = 0x1429C8EA0 - ImageBase; // 74 5F E8 ? ? ? ? 48 8D 4C 24 20 8B D8 E8 ? ? ? ? 48 8B C8 8B D3 E8, expected: 2, index: 1
-constexpr uintptr_t CPatches_AmdSMT = 0x142B3F25B - ImageBase; // 75 2D 33 C9 B8 01 00 00 00 0F A2 8B C8 C1 F9 08, expected: 1, index: 0
+constexpr uintptr_t CPatches_Vignette = 0x141166780 - ImageBase; // 48 8B 41 30 48 83 78 68 00 74, expected: 1, index: 0
+constexpr uintptr_t CPatches_MinimapFlicker = 0x1425685ED - ImageBase; // 83 79 2C 00 48 8B F2 4C, expected: 1, index: 0
+constexpr uintptr_t CPatches_OptionsInit = 0x142B96520 - ImageBase; // 40 53 48 83 EC 40 48 8B D9 48 8D 4C 24 20 E8 ? ? ? ? E8 ? ? ? ? 4C 8B 43 08, expected: 1, index: 0
+constexpr uintptr_t CPatches_SkipStartScreen = 0x1429C8DF0 - ImageBase; // 74 5F E8 ? ? ? ? 48 8D 4C 24 20 8B D8 E8 ? ? ? ? 48 8B C8 8B D3 E8, expected: 2, index: 1
+constexpr uintptr_t CPatches_AmdSMT = 0x142B3F1AB - ImageBase; // 75 2D 33 C9 B8 01 00 00 00 0F A2 8B C8 C1 F9 08, expected: 1, index: 0
 #pragma endregion
 
 #pragma region CPhotoMode
-constexpr uintptr_t CPhotoMode_SetRecordID = 0x142D61020 - ImageBase; // 48 8B C4 55 57 48 8D 68 A1 48 81 EC 98 00 00 00 48 89 58 08 48 8B D9 48 89 70 18 48 8D 4D 27 48, expected: 1, index: 0
+constexpr uintptr_t CPhotoMode_SetRecordID = 0x142D60F40 - ImageBase; // 48 8B C4 55 57 48 8D 68 A1 48 81 EC 98 00 00 00 48 89 58 08 48 8B D9 48 89 70 18 48 8D 4D 27 48, expected: 1, index: 0
 #pragma endregion
 
 #pragma region CRenderGlobal
-constexpr uintptr_t CRenderGlobal_InstanceOffset = 0x144CB7BC0 - ImageBase; // 48 8B 05 ? ? ? ? 48 8B 88 18 8E 5A 01 8B 41 08 C3, expected: 1, index: 0, offset: 3
-constexpr uintptr_t CRenderGlobal__DoNotUse_RenderQueueOffset = 0x151F0FFB9 - ImageBase; // 49 39 29 0F 84 ? ? ? ? 41 39 69 24 0F 84 ? ? ? ? 49 8B 95, expected: 1, index: 0, offset: 0
-constexpr uintptr_t CRenderGlobal_Resize = 0x142C84750 - ImageBase; // 44 88 4C 24 20 44 89 44 24 18 89 54 24 10 89 4C, expected: 1, index: 0
+constexpr uintptr_t CRenderGlobal_InstanceOffset = 0x144CB6420 - ImageBase; // 48 8B 05 ? ? ? ? 48 8B 88 18 8E 5A 01 8B 41 08 C3, expected: 1, index: 0, offset: 3
+constexpr uintptr_t CRenderGlobal__DoNotUse_RenderQueueOffset = 0x151F06CD9 - ImageBase; // 49 39 29 0F 84 ? ? ? ? 41 39 69 24 0F 84 ? ? ? ? 49 8B 95, expected: 1, index: 0, offset: 0
+constexpr uintptr_t CRenderGlobal_Resize = 0x142C7B470 - ImageBase; // 44 88 4C 24 20 44 89 44 24 18 89 54 24 10 89 4C, expected: 1, index: 0
 #pragma endregion
 
 #pragma region CRenderNode_Present
-constexpr uintptr_t CRenderNode_Present_DoInternal = 0x142C86E40 - ImageBase; // 48 89 5C 24 08 48 89 6C  24 18 48 89 74 24 20 57 41 56 41 57 48 83 EC 30 8B 01 41 8B F8 4C 8B 35, expected: 1, index: 0
+constexpr uintptr_t CRenderNode_Present_DoInternal = 0x142C7DB60 - ImageBase; // 48 89 5C 24 08 48 89 6C  24 18 48 89 74 24 20 57 41 56 41 57 48 83 EC 30 8B 01 41 8B F8 4C 8B 35, expected: 1, index: 0
 #pragma endregion
 
 #pragma region CScript
 constexpr uintptr_t CScript_RunPureScript = 0x140206EF0 - ImageBase; // 40 55 48 81 EC D0 00 00 00 48 8D 6C 24 40 8B, expected: 1, index: 0
 constexpr uintptr_t CScript_AllocateFunction = 0x1401A77A0 - ImageBase; // BA B8 00 00 00 48 8D 4D D7 E8, expected: 3, index: 0
 constexpr uintptr_t CScript_Log = 0x1401E9170 - ImageBase; // 40 53 48 83 EC ? 48 8D 4C 24 20 48 8B DA E8 ? ? ? ? 33 D2 48 8D 4C  24 40 E8, expected: 1, index: 0
-constexpr uintptr_t CScript_ToStringDEBUG = 0x140BCAA40 - ImageBase; // 48 89 5C 24 08 57 48 83  EC 20 FE 42 62 4C 8D 15 ? ? ? ? 33 C9 33 C0, expected: 4, index: 2
+constexpr uintptr_t CScript_ToStringDEBUG = 0x140BCA9F0 - ImageBase; // 48 89 5C 24 08 57 48 83  EC 20 FE 42 62 4C 8D 15 ? ? ? ? 33 C9 33 C0, expected: 4, index: 2
 constexpr uintptr_t CScript_LogChannel = 0x1401E9210 - ImageBase; // 4C 8B DC 49 89 5B 08 49  89 73 18 57 48 83 EC 70 48 8B 02 ? ? ? ? ? ? ? FE 42 62 4D 8D 43 10 33 FF 45 33 C9 49 89  7B 10 48 8B DA 48 89 7A, expected: 1, index: 0
-constexpr uintptr_t CScript_TDBIDConstructorDerive = 0x142B8F640 - ImageBase; // 40 53 48 83 EC 30 33 C0 4C 89 44 24 20 48 8B DA, expected: 1, index: 0
-constexpr uintptr_t CScript_ProcessRunningState = 0x140A68EB0 - ImageBase; // 40 53 48 83 EC 20 48 8B 0D ? ? ? ? 48 8B DA E8 ? ? ? ? 84 C0, expected: 1, index: 0
-constexpr uintptr_t CScript_TweakDBLoad = 0x140BC8D70 - ImageBase; // 48 89 5C 24 18 55 57 41 56 48 8B EC 48 83 EC 70 48 8B D9 45 33 F6 48 8D, expected: 1, index: 0
+constexpr uintptr_t CScript_TDBIDConstructorDerive = 0x142B8F590 - ImageBase; // 40 53 48 83 EC 30 33 C0 4C 89 44 24 20 48 8B DA, expected: 1, index: 0
+constexpr uintptr_t CScript_ProcessRunningState = 0x140A68E60 - ImageBase; // 40 53 48 83 EC 20 48 8B 0D ? ? ? ? 48 8B DA E8 ? ? ? ? 84 C0, expected: 1, index: 0
+constexpr uintptr_t CScript_TweakDBLoad = 0x140BC8D20 - ImageBase; // 48 89 5C 24 18 55 57 41 56 48 8B EC 48 83 EC 70 48 8B D9 45 33 F6 48 8D, expected: 1, index: 0
 constexpr uintptr_t CScript_RegisterMemberFunction = 0x1402061E0 - ImageBase; // 48 89 5C 24 08 57 48 83 EC 20 49 8B C1 4D 8B D0 44 8B 4C 24 58 48 8B DA 41 83 C9 03, expected: 1, index: 0
 #pragma endregion
 
 #pragma region CWinapi
-constexpr uintptr_t CWinapi_ClipToCenter = 0x140784670 - ImageBase; // 48 89 5C 24 08 57 48 83 EC 30 48 8B 99 ? 01 00 00 48 8B F9 FF, expected: 1, index: 0
+constexpr uintptr_t CWinapi_ClipToCenter = 0x140784620 - ImageBase; // 48 89 5C 24 08 57 48 83 EC 30 48 8B 99 ? 01 00 00 48 8B F9 FF, expected: 1, index: 0
 #pragma endregion
 
 #pragma region gameIGameSystem
-constexpr uintptr_t gameIGameSystem_Constructor = 0x140AEC016 - ImageBase; // 48 8B D9 E8 ? ? ? ? 48 8D 05 ? ? ? ? 48 C7 43 40 00 00 00 00, expected: 2, index: 0
-constexpr uintptr_t gameIGameSystem_Initialize = 0x142D62A00 - ImageBase; // 48 89 5C 24 18 48 89 6C 24 20 57 48 83 EC 30 48 8B 42 78, expected: 1, index: 0
-constexpr uintptr_t gameIGameSystem_UnInitialize = 0x142D616B0 - ImageBase; // 40 53 48 83 EC 20 48 8B D9 E8 ? ? ? ? 33 C0 48 89 43 50 48 89 43 48, expected: 1, index: 0
-constexpr uintptr_t gameIGameSystem_Spawn = 0x142D64270 - ImageBase; // 48 89 5C 24 18 55 56 41 54 41 56 41 57 48 8D 6C 24 90 48 81 EC 70 01 00 00 48 83 79 50 00 49 8B, expected: 1, index: 0
-constexpr uintptr_t gameIGameSystem_Despawn = 0x142D616E0 - ImageBase; // 48 89 5C 24 10 48 89 6C  24 18 56 57 41 54 41 56 41 57 48 83 EC 50 4C 8B F9 0F 57 C0 48 83 C1 41, expected: 1, index: 0
-constexpr uintptr_t gameIGameSystem_SpawnCallback = 0x1410DC120 - ImageBase; // 48 89 5C 24 18 48 89 6C  24 20 56 57 41 56 48 83 EC 70 48 8B F1 48 8B EA  48 83 C1 48 E8, expected: 1, index: 0
+constexpr uintptr_t gameIGameSystem_Constructor = 0x140AEBFC6 - ImageBase; // 48 8B D9 E8 ? ? ? ? 48 8D 05 ? ? ? ? 48 C7 43 40 00 00 00 00, expected: 2, index: 0
+constexpr uintptr_t gameIGameSystem_Initialize = 0x142D62920 - ImageBase; // 48 89 5C 24 18 48 89 6C 24 20 57 48 83 EC 30 48 8B 42 78, expected: 1, index: 0
+constexpr uintptr_t gameIGameSystem_UnInitialize = 0x142D615D0 - ImageBase; // 40 53 48 83 EC 20 48 8B D9 E8 ? ? ? ? 33 C0 48 89 43 50 48 89 43 48, expected: 1, index: 0
+constexpr uintptr_t gameIGameSystem_Spawn = 0x142D64190 - ImageBase; // 48 89 5C 24 18 55 56 41 54 41 56 41 57 48 8D 6C 24 90 48 81 EC 70 01 00 00 48 83 79 50 00 49 8B, expected: 1, index: 0
+constexpr uintptr_t gameIGameSystem_Despawn = 0x142D61600 - ImageBase; // 48 89 5C 24 10 48 89 6C  24 18 56 57 41 54 41 56 41 57 48 83 EC 50 4C 8B F9 0F 57 C0 48 83 C1 41, expected: 1, index: 0
+constexpr uintptr_t gameIGameSystem_SpawnCallback = 0x1410DC0D0 - ImageBase; // 48 89 5C 24 18 48 89 6C  24 20 56 57 41 56 48 83 EC 70 48 8B F1 48 8B EA  48 83 C1 48 E8, expected: 1, index: 0
 #pragma endregion
 } // namespace CyberEngineTweaks::Addresses