Memory watch bug fix

Fixed the game crashing when attempting to read from memory addresses beyond 0x817FFFFF. The menu will now automatically adjust the address to prevent the crash.

Author: Zephiles

ttyd-tools/rel/include/memorywatch.h

@@ -13,5 +13,6 @@ void addMemoryWatch(int32_t slot);
 void deleteWatch(int32_t slot);
 uint32_t adjustWatchValueControls(int32_t slot);
 void adjustWatchTempValueAndBounds(int32_t slot, uint32_t highestDigit, int32_t valueChangedBy);
+void *fixBaseAddress(int32_t slot, void *address);
 
 }

ttyd-tools/rel/source/memorywatch.cpp

@@ -508,7 +508,10 @@ uint32_t adjustWatchValueControls(int32_t slot)
 						case 0:
 						{
 							// Modifying the address
-							MemoryWatch[slot].Address = MemoryWatchSecondaryValue;
+							// Make sure the addresses being read does not exceed 0x817FFFFF
+							MemoryWatch[slot].Address = reinterpret_cast<uint32_t>(
+								fixBaseAddress(slot, reinterpret_cast<void *>(MemoryWatchSecondaryValue)));
+							
 							MenuSelectionStates = 0;
 
 							FrameCounter = 1;
@@ -591,7 +594,10 @@ void adjustWatchTempValueAndBounds(int32_t slot, uint32_t highestDigit, int32_t
 				case 0:
 				{
 					// Modifying the address
-					UpperBoundUnsigned = 0x817FFFFF;
+					// Make sure the upper bound does not exceed 0x817FFFFF
+					UpperBoundUnsigned = reinterpret_cast<uint32_t>(
+						fixBaseAddress(slot, reinterpret_cast<void *>(0x817FFFFF)));
+					
 					LowerBoundUnsigned = 0x80000000;
 
 					if (tempMemoryWatchSecondaryValue > UpperBoundUnsigned)
@@ -635,4 +641,49 @@ void adjustWatchTempValueAndBounds(int32_t slot, uint32_t highestDigit, int32_t
 	}
 }
 
+void *fixBaseAddress(int32_t slot, void *address)
+{
+	uint32_t CurrentTypeSize;	
+	switch (MemoryWatch[slot].Type)
+	{
+		case time:
+		case s64:
+		case u64:
+		case f64:
+		{
+			CurrentTypeSize = 8;
+			break;
+		}
+		case s32:
+		case u32:
+		case f32:
+		{
+			CurrentTypeSize = 4;
+			break;
+		}
+		case s16:
+		case u16:
+		{
+			CurrentTypeSize = 2;
+			break;
+		}
+		case s8:
+		case u8:
+		default:
+		{
+			CurrentTypeSize = 1;
+			break;
+		}
+	}
+	
+	// Make sure the address does not exceed 0x817FFFFF
+	uint32_t tempAddress = reinterpret_cast<uint32_t>(address);
+	while ((tempAddress + CurrentTypeSize - 1) >= 0x81800000)
+	{
+		tempAddress--;
+	}
+	
+	return reinterpret_cast<void *>(tempAddress);
+}
+
 }

ttyd-tools/rel/source/menufunctions.cpp

@@ -1,6 +1,7 @@
 #include "menufunctions.h"
 #include "global.h"
 #include "commonfunctions.h"
+#include "memorywatch.h"
 #include "codes.h"
 #include "items.h"
 
@@ -1185,6 +1186,12 @@ uint32_t memoryAddressTypeButtonControls()
 		{
 			uint32_t tempMenuSelectedOption = MenuSelectedOption;
 			MemoryWatch[tempMenuSelectedOption].Type = tempSecondaryMenuOption;
+			
+			// Make sure the addresses being read does not exceed 0x817FFFFF
+			MemoryWatch[tempMenuSelectedOption].Address = reinterpret_cast<uint32_t>(
+				fixBaseAddress(tempMenuSelectedOption, reinterpret_cast<void *>(
+					MemoryWatch[tempMenuSelectedOption].Address)));
+			
 			SelectedOption = 0;
 
 			// Adjust the hex setting if necessary