From 0d4ebf34bfb93dbb215f49e9ca64b58fd7284a2b Mon Sep 17 00:00:00 2001
From: jbzdarkid <jbzdarkid@gmail.com>
Date: Sun, 18 Nov 2018 14:56:10 -0800
Subject: [PATCH] Some work on synchronizing for new version

---
 Source/ChallengeRandomizer.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Source/ChallengeRandomizer.cpp b/Source/ChallengeRandomizer.cpp
index b9b54e0f..0bc51f6c 100644
--- a/Source/ChallengeRandomizer.cpp
+++ b/Source/ChallengeRandomizer.cpp
@@ -52,35 +52,35 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
 			}
 		}
 		if (cut_random_edges == -1) {
-			int index = find(data, {0x8B, 0x80, 0xBC, 0x03, 0x00, 0x00, 0x89, 0x44, 0x24, 0x3C, 0x33, 0xC0});
+			int index = find(data, {0x89, 0x44, 0x24, 0x3C, 0x33, 0xC0, 0x85, 0xC0, 0x75, 0xFA});
 			if (index != -1) {
-				cut_random_edges = i + index - 0x1C;
+				cut_random_edges = i + index - 0x22;
 				AdjustRng(cut_random_edges + 0x5D);
 			}
 		}
 		if (get_empty_decoration_slot == -1) {
-			int index = find(data, {0x57, 0x48, 0x83, 0xEC, 0x20, 0x8B, 0xB9, 0x38, 0x04});
+			int index = find(data, {0x57, 0x48, 0x83, 0xEC, 0x20, 0x8B, 0xB9, 0x38, 0x04}); // TODO: Sync versions
 			if (index != -1) {
 				get_empty_decoration_slot = i + index - 0x5;
 				AdjustRng(get_empty_decoration_slot + 0x16);
 			}
 		}
 		if (get_empty_dot_spot == -1) {
-			int index = find(data, {0xF7, 0xF3, 0x85, 0xD2, 0x74, 0xEC});
+			int index = find(data, {0xF7, 0xF3, 0x85, 0xD2, 0x74, 0xEC}); // TODO: Sync versions
 			if (index != -1) {
 				get_empty_dot_spot = i + index - 0x2E;
 				AdjustRng(get_empty_dot_spot + 0x23);
 			}
 		}
 		if (add_exactly_this_many_bisection_dots == -1) {
-			int index = find(data, {0x48, 0x8B, 0xB4, 0x24, 0xB8, 0x00, 0x00, 0x00, 0x48, 0x8B, 0xBC, 0x24, 0xB0, 0x00, 0x00, 0x00});
+			int index = find(data, {0x48, 0x8B, 0xB4, 0x24, 0xB8, 0x00, 0x00, 0x00, 0x48, 0x8B, 0xBC, 0x24, 0xB0, 0x00, 0x00, 0x00}); // TODO: Sync versions
 			if (index != -1) {
 				add_exactly_this_many_bisection_dots = i + index - 0x20;
 				AdjustRng(add_exactly_this_many_bisection_dots + 0x1C);
 			}
 		}
 		if (make_a_shaper == -1) {
-			int index = find(data, {0xF7, 0xE3, 0xD1, 0xEA, 0x8D, 0x0C, 0x52});
+			int index = find(data, {0xF7, 0xE3, 0xD1, 0xEA, 0x8D, 0x0C, 0x52}); // TODO: Sync versions
 			if (index != -1) {
 				make_a_shaper = i + index - 0x19;
 				AdjustRng(make_a_shaper + 0x9);
@@ -89,7 +89,7 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
 			}
 		}
 		if (/*Entity_Machine_Panel::*/init_pattern_data_lotus == -1) {
-			int index = find(data, {0x40, 0x55, 0x56, 0x48, 0x8D, 0x6C, 0x24, 0xB1});
+			int index = find(data, {0x40, 0x55, 0x56, 0x48, 0x8D, 0x6C, 0x24, 0xB1}); // TODO: Sync versions
 			if (index != -1) {
 				init_pattern_data_lotus = i + index;
 				AdjustRng(init_pattern_data_lotus + 0x433);
@@ -102,7 +102,7 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
 			}
 		}
 		if (/*Entity_Record_Player::*/reroll_lotus_eater_stuff == -1) {
-			int index = find(data, {0xB8, 0xAB, 0xAA, 0xAA, 0xAA, 0x41, 0xC1, 0xE8});
+			int index = find(data, {0xB8, 0xAB, 0xAA, 0xAA, 0xAA, 0x41, 0xC1, 0xE8}); // TODO: Sync versions
 			if (index != -1) {
 				reroll_lotus_eater_stuff = i + index - 0x37;
 				AdjustRng(reroll_lotus_eater_stuff + 0x24);
@@ -111,7 +111,7 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
 		}
 		// These disable the random locations on timer panels, which would otherwise increment the RNG.
 		if (do_lotus_minutes == -1) {
-			int index = find(data, {0x0F, 0xBE, 0x6C, 0x08, 0xFF, 0x45});
+			int index = find(data, {0x0F, 0xBE, 0x6C, 0x08, 0xFF, 0x45}); // TODO: Sync versions
 			if (index != -1) {
 				do_lotus_minutes = i + index - 0x2B;
 				_memory->WriteData<byte>({do_lotus_minutes + 0x43B}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
@@ -119,7 +119,7 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
 			}
 		}
 		if (do_lotus_eighths == -1) {
-			int index = find(data, {0x75, 0xF5, 0x0F, 0xBE, 0x44, 0x08, 0xFF});
+			int index = find(data, {0x75, 0xF5, 0x0F, 0xBE, 0x44, 0x08, 0xFF}); // TODO: Sync versions
 			if (index != -1) {
 				do_lotus_eighths = i + index - 0x39;
 				_memory->WriteData<byte>({do_lotus_eighths + 0x1E7}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
@@ -127,9 +127,10 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
 		}
 		// This injection ensures that the seed is set every time the challenge is started.
 		if (do_success_side_effects == -1) {
-			int index = find(data, {0x85, 0xC0, 0x7E, 0x2C, 0x48, 0x6B, 0xC8, 0x34});
+			int index = find(data, {0xFF, 0xC8, 0x99, 0x2B, 0xC2, 0xD1, 0xF8, 0x8B, 0xD0});
 			if (index != -1) {
-				do_success_side_effects = i + index;
+				do_success_side_effects = i + index + 0x3E;
+				if (GLOBALS == 0x62A080) do_success_side_effects += 4; // There's an extra 4 opcodes in the new version
 				_memory->WriteData<byte>({do_success_side_effects}, {
 					0x8B, 0x0D, 0x00, 0x00, 0x00, 0x00,			// mov ecx, [] ;This is going to be the address of the custom RNG
 					0x67, 0xC7, 0x01, 0x00, 0x00, 0x00, 0x00,	// mov dword ptr ds:[ecx], 0x0 ;This is going to be the seed value