Properly reset values when closing the menu

Also properly restored the Memory Watch coordinates if they were currently being modified.

Author: Zephiles

ttyd-tools/rel/include/menufunctions.h

@@ -27,7 +27,6 @@ bool checkForClosingErrorMessage();
 void correctInventoryCurrentMenuOptionAndPage(uint32_t maxOptionsPerPage);
 uint32_t getHighestAdjustableValueDigit(uint32_t currentMenu);
 int32_t getDigitBeingChanged(int32_t number, int32_t valueChangedBy);
-int32_t getDigitBeingChangedUnsignedHex(uint32_t number, int32_t valueChangedBy);
 void setAdjustableValueToMax(uint32_t currentMenu);
 void setAdjustableValueToMin(uint32_t currentMenu);
 uint32_t adjustableValueButtonControls(uint32_t currentMenu);

ttyd-tools/rel/source/draw.cpp

@@ -3044,6 +3044,10 @@ void drawMemoryWatchesOnOverworld()
 	uint32_t tempMenuSelectionOption = MenuSelectedOption;
 	uint32_t Size = sizeof(MemoryWatch) / sizeof(MemoryWatch[0]);
 
+	uint32_t Color = 0xFFFFFFFF;
+	uint8_t Alpha = 0xFF;
+	float Scale = 0.75;
+	
 	for (uint32_t i = 0; i < Size; i++)
 	{
 		if (MemoryWatch[i].Display)
@@ -3056,9 +3060,6 @@ void drawMemoryWatchesOnOverworld()
 			else
 			{
 				// Draw the watch
-				uint32_t Color = 0xFFFFFFFF;
-				uint8_t Alpha = 0xFF;
-				float Scale = 0.75;
 				int32_t PosX = MemoryWatch[i].PosX;
 				int32_t PosY = MemoryWatch[i].PosY;
 				drawText(getValueString(i), PosX, PosY, Alpha, Color, Scale);

ttyd-tools/rel/source/global.cpp

@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.14";
+const char *VersionNumber = "v3.0.15";
 
 const char *RootLines[] = 
 {

ttyd-tools/rel/source/menu.cpp

@@ -3202,6 +3202,19 @@ void enableOrDisableMenu()
 		}
 		else
 		{
+			if (HideMenu)
+			{
+				// Restore the memory watch default position if currently modifying it
+				if (CurrentMenu == MEMORY_MODIFY)
+				{
+					uint32_t tempMenuSelectedOption = MenuSelectedOption;
+					MemoryWatch[tempMenuSelectedOption].PosX = MemoryWatchPosition.PosX;
+					MemoryWatch[tempMenuSelectedOption].PosY = MemoryWatchPosition.PosY;
+				}
+			}
+			
+			resetMenuToRoot();
+			
 			// Lower the System Level if not in a battle
 			lowerSystemLevel();
 

ttyd-tools/rel/source/menufunctions.cpp

@@ -24,6 +24,8 @@ void closeMenu()
 {
 	MenuIsDisplayed = false;
 
+	resetMenuToRoot();
+	
 	// Lower the System Level if not in a battle
 	lowerSystemLevel();