Memory - Maintain page when choosing watch

Author: Zephiles

ttyd-tools/rel/source/menu.cpp

@@ -1906,7 +1906,7 @@ void menuCheckButton()
 								// Enter the next menu
 								CurrentMenu = MEMORY_MODIFY;
 								MenuSelectedOption = tempCurrentMenuOption;
-								resetMenu();
+								resetMenuNoPageReset();
 							}
 							else
 							{
@@ -1975,7 +1975,7 @@ void menuCheckButton()
 				{
 					if (tempSelectedOption == 0)
 					{
-						default_DPAD_Actions(CurrentButton);
+						adjustMenuNoPageEdit(CurrentButton);
 					}
 					break;
 				}
@@ -1992,14 +1992,14 @@ void menuCheckButton()
 									// Go back to the previous menu
 									CurrentMenu = tempPreviousMenu;
 									MenuSelectedOption = 0;
-									resetMenu();
+									resetMenuNoPageReset();
 									break;
 								}
 								case CHANGE_ADDRESS:
 								{
 									// Enter the next menu
 									CurrentMenu = MEMORY_CHANGE_ADDRESS;
-									resetMenu();
+									resetMenuNoPageReset();
 									break;
 								}
 								case CHANGE_TYPE:
@@ -2064,7 +2064,7 @@ void menuCheckButton()
 							// Go back to the previous menu
 							CurrentMenu = tempPreviousMenu;
 							MenuSelectedOption = 0;
-							resetMenu();
+							resetMenuNoPageReset();
 							break;
 						}
 						default:
@@ -2097,7 +2097,7 @@ void menuCheckButton()
 							{
 								case 0:
 								{
-									default_DPAD_Actions(CurrentButton);
+									adjustMenuNoPageEdit(CurrentButton);
 									break;
 								}
 								default:
@@ -2131,7 +2131,7 @@ void menuCheckButton()
 										{
 											// Go back to the previous menu
 											CurrentMenu = tempPreviousMenu;
-											resetMenu();
+											resetMenuNoPageReset();
 											break;
 										}
 										case CHANGE_ADDRESS_OR_POINTERS:
@@ -2214,7 +2214,7 @@ void menuCheckButton()
 								{
 									// Go back to the previous menu
 									CurrentMenu = tempPreviousMenu;
-									resetMenu();
+									resetMenuNoPageReset();
 									break;
 								}
 								default:

ttyd-tools/rel/source/menufunctions.cpp

@@ -3450,9 +3450,11 @@ void adjustMemoryChangeAddressOrPointerSelection(uint32_t button)
 	uint32_t TotalMenuOptions = MemoryWatch[MenuSelectedOption].AddressOffsetAmount + 1;
 	uint32_t MaxOptionsPerRow = 1;
 	uint32_t MaxOptionsPerPage = 11;
+	uint8_t tempPage[1];
+	tempPage[0] = 0;
 
 	adjustMenuSelectionVertical(button, CurrentMenuOption, 
-		CurrentPage, TotalMenuOptions, MaxOptionsPerPage, 
+		tempPage[0], TotalMenuOptions, MaxOptionsPerPage, 
 			MaxOptionsPerRow, false);
 }