Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add crossbuild support of b1436 for RedM #899

Merged
merged 6 commits into from Aug 24, 2021
Merged

Add crossbuild support of b1436 for RedM #899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5673c2
feat(rdr3): cross-build support for 1436.25
Disquse Jul 14, 2021
a4f92f9
fix(data): update rdr3 meta files to 1436.25
Disquse Jul 14, 2021
14a4d86
tweak(scripting/rdr3): implement removed in 1436.25 text natives
Disquse Jul 14, 2021
7bab2db
tweak(rdr3): improve some 1436 hooks
Disquse Jul 14, 2021
f25e98e
tweak(client/launcher): add ipfs hashes for RDR3 1436.25 game cache
Disquse Jul 30, 2021
3ac0a6b
tweak(rdr3): update 1436 crossbuild to 1436.26
Disquse Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
tweak(rdr3): update 1436 crossbuild to 1436.26
  • Loading branch information
@Disquse
Disquse committed Aug 24, 2021
commit 3ac0a6b60343629b236b0c3b3c0947fab6555da5
7 changes: 3 additions & 4 deletions code/client/launcher/ExecutableLoader.Snapshot.cpp
View file
Open in desktop
Expand Up @@ -68,16 +68,15 @@ inline uintptr_t GetTriggerEP()

if (xbr::IsGameBuild<1355>())
{
return 0x142DE455C;
return 0x142DE455C; // 1355.18
}

if (xbr::IsGameBuild<1436>())
{
return 0x142DE455C;
return 0x142E8B79C; // 1436.26
}

// 1311.20
return 0x142E0F92C;
return 0x142E0F92C; // 1311.20
}

#define TRIGGER_EP (GetTriggerEP())
Expand Down
10 changes: 5 additions & 5 deletions code/client/launcher/GameCache.cpp
View file
Open in desktop
Expand Up @@ -1462,12 +1462,12 @@ std::map<std::string, std::string> UpdateGameCache()
// 1311/1355/1436 toggle
if (IsTargetGameBuild<1436>())
{
g_requiredEntries.push_back({ "RDR2.exe", "af5c7ac8e0364b9f16dd56038514b2b6183a856b", "ipfs://bafybeigxlkqrdkwepcj3svowxfrnkucznuli4ui4xmjxazpl7dp4vhf5my", 89612184 });
g_requiredEntries.push_back({ "appdata0_update.rpf", "40c389093bb843235119cf0aaffdc020beba493d", "ipfs://bafybeigobeu5yeiobdsobl3ln6em2djq3dyfq7uqx4z6sq7prpkjlludze", 3164575 });
g_requiredEntries.push_back({ "RDR2.exe", "3c7a863dd71ee4dc66b3ee2f031616c53ceb5090", "ipfs://bafybeigsscjuvgk7bz4hryhxrphzmchrrg4trsise2bbvq3utqdryqyddy", 89830808 });
g_requiredEntries.push_back({ "appdata0_update.rpf", "9d1d6bbe5aa65adf030ec38c5ab9ecc082840207", "ipfs://bafybeifjzvqpiybxsqvukwa6upnddkgoccsl5okg3hgvw3yyzxz7vca7f4", 3164575 });
g_requiredEntries.push_back({ "shaders_x64.rpf", "f4f06c18701d66958eb6f0ac243c8467033b864b", "ipfs://bafybeihfgavfbsihf65dtv6vyipphbcfrrytcj53hulzkoy7nonpwh4h74", 233898030 });
g_requiredEntries.push_back({ "update_1.rpf", "e623e54e3e1dd938a84de780d331a939446e4ba0", "ipfs://bafybeiab4wxjx6gynce2za7tkztgdkthiyos4n2t5hbknzh5cts2eemrgq", 2836982634 });
g_requiredEntries.push_back({ "update_2.rpf", "e8a1cb04c4c8b4aba5b0a311a6a1e8d547393da4", "ipfs://bafybeiase5grglqhkivcifcllk6tvr2csc4befvtsyej6aph4xb65eyxhi", 152008398 });
g_requiredEntries.push_back({ "update_3.rpf", "b7035ca49f70ed0fc79d6f5690376c5b49784d21", "ipfs://bafybeihuvd6hkn6ba75d6xs3o2ecj5q5pkve7yuhf4jox4uhnu3bfq7awq", 132374108 });
g_requiredEntries.push_back({ "update_1.rpf", "0853366e69b29daf01c05d643557e75d610933e7", "ipfs://bafybeihk27hp3wz3ud4pzlyobloievuk3xrntxhl26exec3pgrhlplnmly", 2836982634 });
g_requiredEntries.push_back({ "update_2.rpf", "3550ce534b2997306ae1bc13fc3abeec4573389f", "ipfs://bafybeiaum2y7k6gzsde2xwlstdidcp5vyb6vyqgl5djkwjpb4uesvz2fde", 152008462 });
g_requiredEntries.push_back({ "update_3.rpf", "5f2f26d9eb31f51a21a15f6466814c289906ca35", "ipfs://bafybeic6gss2v42cuc2xol23lc6s36rgoqnmeuuzf72z4wuxdwda4svvf4", 132374108 });
g_requiredEntries.push_back({ "update_4.rpf", "39ca2bbb7a0ab8d8e09288ca8783b91654c9b91b", "ipfs://bafybeiefr5ayhajox2zcfwrkjvhoqt7c4ebcfiaxr3grjtrtvefd4en3fy", 2014659811 });
}
else if (IsTargetGameBuild<1355>())
Expand Down
2 changes: 1 addition & 1 deletion code/client/launcher/premake5.lua
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@ local function launcherpersonality_inner(name, aslr)
local gameBuild = '1311'

if name == 'game_1355' then gameBuild = '1355_18' end
if name == 'game_1436' then gameBuild = '1436_25' end
if name == 'game_1436' then gameBuild = '1436_26' end

local gameDump = ("C:\\f\\RDR2_%s.exe"):format(gameBuild)

Expand Down
10 changes: 5 additions & 5 deletions code/components/ros-patches-five/src/ros/Entitlements.cpp
View file
Open in desktop
Expand Up @@ -747,13 +747,13 @@ mapper->AddGameService("ugc.asmx/Publish", [](const std::string& body)
<?xml version="1.0" encoding="utf-8"?>
<Response xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ms="0" xmlns="GetBuildManifestFull">
<Status>1</Status>
<Result BuildId="81" VersionNumber="1.0.1436.25" BuildDateUtc="2019-11-05T11:39:37.0266667">
<Result BuildId="82" VersionNumber="1.0.1436.26" BuildDateUtc="2019-11-05T11:39:37.0266667">
<FileManifest>
<FileDetails FileEntryId="9178" FileEntryVersionId="9648" FileSize="89612184" TimestampUtc="2019-11-05T11:39:34.8800000">
<FileDetails FileEntryId="9178" FileEntryVersionId="9648" FileSize="89830808" TimestampUtc="2019-11-05T11:39:34.8800000">
<RelativePath>RDR2.exe</RelativePath>
<SHA256Hash>096420ddeb42dc1f156e68b3da20e258664e8f1a9fc2afeb2a2b50eb133fe3d2</SHA256Hash>
<SHA256Hash>d3ac2403bac567a460617af4dc3df15d0928b0e8634da76dcf64de56ad7bdf87</SHA256Hash>
<FileChunks>
<Chunk FileChunkId="13046" SHA256Hash="096420ddeb42dc1f156e68b3da20e258664e8f1a9fc2afeb2a2b50eb133fe3d2" StartByteOffset="0" Size="89612184" />
<Chunk FileChunkId="13046" SHA256Hash="d3ac2403bac567a460617af4dc3df15d0928b0e8634da76dcf64de56ad7bdf87" StartByteOffset="0" Size="89830808" />
</FileChunks>
</FileDetails>
%s
Expand Down Expand Up @@ -1045,7 +1045,7 @@ mapper->AddGameService("ugc.asmx/Publish", [](const std::string& body)
</Result>
</Response>)",
Is372() ? 4 : (Is2060() ? 83 : (Is2372() ? 92 : (Is2189() ? 88 : 80))),
Is1355() ? 80 : (Is1436() ? 81 : 79));
Is1355() ? 80 : (Is1436() ? 82 : 79));
});


Expand Down