Add files via upload

rabidcopy · Oct 30, 2019 · 91b379f · 91b379f
1 parent f23d0bd
commit 91b379f
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 6 deletions.
diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -41,6 +41,8 @@ void Main::Start()
 
 	//Very fun
 	PatchRegionLock();
+	VanillaGliderFix();
+	VanillaRideFix();
 	ChangeArtifactDisplay();
 
 	SetupHooks();
@@ -106,19 +108,69 @@ void Main::ChangeArtifactDisplay()
 	MemoryHelper::FindAndReplaceString(L"Light Radius", L"Base Resistance");
 }
 
+void Main::VanillaGliderFix()
+{
+	int glider_patch[] = { 0x49, 0x8B, 0xCD, 0xE8, 0x5A, 0x25, 0xDA, 0xFF, 0xF3, 0x0F, 0x10, 0xC8, 0x41, 0x0F, 0x28, 0xC7 };
+	auto glider_find = MemoryHelper::FindPattern("F3 0F 5F C1 F3 0F 10 0D 06 0B 1F ? 0F 28 D1 F3");
+
+	for (int i = 0; i < 16; i++)
+	{
+		MemoryHelper::PatchMemory<uint8_t>(glider_find + i, glider_patch[i]);
+	}
+
+}
+
+void Main::VanillaRideFix()
+{
+	int ride_patch1[] = { 0x49, 0x8B, 0xCD, 0xE8, 0xDA, 0x94, 0xDA, 0xFF, 0x0F, 0x28, 0xF8 };
+	int ride_patch2[] = { 0x0F, 0x1F, 0x40, 0x00, 0xF3, 0x44, 0x0F, 0x59, 0xCF };
+	int ride_patch3[] = { 0xF3, 0x0F, 0x5C, 0xC1, 0xF3, 0x0F, 0x59, 0x05, 0xA3, 0xD5, 0x3C, 0x00, 0xF3, 0x0F, 0x58, 0x05, 0x17, 0x92, 0x3C, 0x00, 0xF3, 0x0F, 0x59, 0x05, 0x01, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0xA0, 0x3F };
+
+	auto ride_find1 = MemoryHelper::FindPattern("48 8B D3 49 8B CF E8 27 29 D5 FF");
+	auto ride_find2 = MemoryHelper::FindPattern("F3 44 0F 59 0D 1A 27 17 ?");
+	auto ride_find3 = MemoryHelper::FindPattern("F3 0F 5C C1 F3 0F 59 05 A3 D5 3C ? F3 0F 58 05 17 92 3C ? C3");
+
+	for (int i = 0; i < 11; i++)
+	{
+		MemoryHelper::PatchMemory<uint8_t>(ride_find1 + i, ride_patch1[i]);
+	}
+
+	for (int i = 0; i < 9; i++)
+	{
+		MemoryHelper::PatchMemory<uint8_t>(ride_find2 + i, ride_patch2[i]);
+	}
+
+	for (int i = 0; i < 33; i++)
+	{
+		MemoryHelper::PatchMemory<uint8_t>(ride_find3 + i, ride_patch3[i]);
+	}
+
+
+}
+
 //Stole this all from Geordan9 at https://fearlessrevolution.com/viewtopic.php?p=104856#p104856 very nice
 void Main::PatchRegionLock()
 {
 	//Might take a second
-	uint64_t special_item_display;
-	while (!(special_item_display = MemoryHelper::FindPattern("08 ? ? ? ? 39 01 0F 85")));
+	//uint64_t special_item_display;
+	//while (!(special_item_display = MemoryHelper::FindPattern("08 ? ? ? ? 39 01 0F 85")));
 
-	auto special_item_use = MemoryHelper::FindPattern("39 01 0F 85 ? ? ? ? 48 FF");
+	//auto special_item_use = MemoryHelper::FindPattern("39 01 0F 85 ? ? ? ? 48 FF");
 	auto equipment_lock = MemoryHelper::FindPattern("41 39 00 75 ? 48 FF C1");
-
-	MemoryHelper::PatchMemory<uint8_t>(special_item_display + 0x8, 0x80);
-	MemoryHelper::PatchMemory<uint8_t>(special_item_use + 0x3, 0x80);
+	auto glider_use = MemoryHelper::FindPattern("0F 84 86 ? ? ? 49 8B 8E");
+	auto boat_use = MemoryHelper::FindPattern("74 66 4D 8B 86 48 04");
+	auto rein_use = MemoryHelper::FindPattern("74 14 49 8B 45 08");
+	auto rein_stay = MemoryHelper::FindPattern("E8 D4 3B D8 FF 84 C0 75 0B 49 8B 86 48 04");
+	auto boat_stay = MemoryHelper::FindPattern("E8 82 3B D8 FF 84 C0 75 0B 49 8B 86 48 04 ? ? C6 40 68");
+
+	//MemoryHelper::PatchMemory<uint8_t>(special_item_display + 0x8, 0x80);
+	//MemoryHelper::PatchMemory<uint8_t>(special_item_use + 0x3, 0x80);
 	MemoryHelper::PatchMemory<uint8_t>(equipment_lock + 0x3, 0x70);
+	MemoryHelper::PatchMemory<uint8_t>(glider_use + 0x01, 0x80);
+	MemoryHelper::PatchMemory<uint8_t>(boat_use, 0x70);
+	MemoryHelper::PatchMemory<uint8_t>(rein_use, 0x70);
+	MemoryHelper::PatchMemory<uint8_t>(rein_stay + 0x07, 0xEB);
+	MemoryHelper::PatchMemory<uint8_t>(boat_stay + 0x07, 0xEB);
 }
 
 void Main::SetConsole(bool open)

diff --git a/src/core/main.h b/src/core/main.h
@@ -3,6 +3,7 @@
 #include <map>
 #include <Windows.h>
 #include <vector>
+#include <string>
 
 
 class Player;
@@ -28,6 +29,10 @@ class Main
 
 	void PatchRegionLock();
 
+	void VanillaRideFix();
+
+	void VanillaGliderFix();
+
 public:
 	static Main& GetInstance();