Inventory menu fix

Zephiles · Zephiles · commit ceca73b552a1 · 2019-04-09T16:18:39.000-05:00
Fixed the Inventory menu breaking when pressing up on the first option or down on the last option when viewing items past the first 20.
diff --git a/ttyd-tools/rel/include/menufunctions.h b/ttyd-tools/rel/include/menufunctions.h
@@ -68,7 +68,7 @@ bool checkForDPADInput();
 uint32_t checkButtonSingleFrame();
 // void correctPageSingleColumn(uint32_t button, uint8_t &currentPage)
 void default_DPAD_Actions(uint32_t button);
-void adjustCheatsSubMenu(uint32_t button);
+void adjustMenuNoPageEdit(uint32_t button);
 void adjustCheatsManageFlagsMainMenu(uint32_t button);
 void adjustMenuSelectionInventory(uint32_t button);
 void adjustCheatClearAreaFlagSelection(uint32_t button);
diff --git a/ttyd-tools/rel/source/global.cpp b/ttyd-tools/rel/source/global.cpp
@@ -6,7 +6,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.20";
+const char *VersionNumber = "v3.0.21";
 
 const char *RootLines[] = 
 {
diff --git a/ttyd-tools/rel/source/menu.cpp b/ttyd-tools/rel/source/menu.cpp
@@ -161,7 +161,7 @@ void menuCheckButton()
 					{
 						case 0:
 						{
-							default_DPAD_Actions(CurrentButton);
+							adjustMenuNoPageEdit(CurrentButton);
 							break;
 						}
 						case DUPLICATE:
@@ -631,7 +631,7 @@ void menuCheckButton()
 				{
 					if (tempMenuSelectionStates == 0)
 					{
-						adjustCheatsSubMenu(CurrentButton);
+						adjustMenuNoPageEdit(CurrentButton);
 					}
 					break;
 				}
@@ -691,7 +691,7 @@ void menuCheckButton()
 				case DPADDOWN:
 				case DPADUP:
 				{
-					adjustCheatsSubMenu(CurrentButton);
+					adjustMenuNoPageEdit(CurrentButton);
 					break;
 				}
 				case A:
@@ -776,7 +776,7 @@ void menuCheckButton()
 				{
 					if (tempMenuSelectionStates == 0)
 					{
-						adjustCheatsSubMenu(CurrentButton);
+						adjustMenuNoPageEdit(CurrentButton);
 					}
 					break;
 				}
@@ -841,7 +841,7 @@ void menuCheckButton()
 				case DPADDOWN:
 				case DPADUP:
 				{
-					adjustCheatsSubMenu(CurrentButton);
+					adjustMenuNoPageEdit(CurrentButton);
 					break;
 				}
 				case A:
@@ -1092,7 +1092,7 @@ void menuCheckButton()
 					{
 						case 0:
 						{
-							adjustCheatsSubMenu(CurrentButton);
+							adjustMenuNoPageEdit(CurrentButton);
 							break;
 						}
 						case SELECT_AREA:
diff --git a/ttyd-tools/rel/source/menufunctions.cpp b/ttyd-tools/rel/source/menufunctions.cpp
@@ -3346,7 +3346,7 @@ void default_DPAD_Actions(uint32_t button)
 	}
 }*/
 
-void adjustCheatsSubMenu(uint32_t button)
+void adjustMenuNoPageEdit(uint32_t button)
 {
 	uint32_t tempCurrentMenu 		= CurrentMenu;
 	uint32_t tempTotalMenuColumns 	= Menu[tempCurrentMenu].TotalMenuColumns;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace mod {`
`8`	`8`
`9`		`-const char *VersionNumber = "v3.0.20";`
	`9`	`+const char *VersionNumber = "v3.0.21";`
`10`	`10`
`11`	`11`	`const char *RootLines[] =`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ void menuCheckButton()`
`161`	`161`	`{`
`162`	`162`	`case 0:`
`163`	`163`	`{`
`164`		`- default_DPAD_Actions(CurrentButton);`
	`164`	`+ adjustMenuNoPageEdit(CurrentButton);`
`165`	`165`	`break;`
`166`	`166`	`}`
`167`	`167`	`case DUPLICATE:`
`@@ -631,7 +631,7 @@ void menuCheckButton()`
`631`	`631`	`{`
`632`	`632`	`if (tempMenuSelectionStates == 0)`
`633`	`633`	`{`
`634`		`- adjustCheatsSubMenu(CurrentButton);`
	`634`	`+ adjustMenuNoPageEdit(CurrentButton);`
`635`	`635`	`}`
`636`	`636`	`break;`
`637`	`637`	`}`
`@@ -691,7 +691,7 @@ void menuCheckButton()`
`691`	`691`	`case DPADDOWN:`
`692`	`692`	`case DPADUP:`
`693`	`693`	`{`
`694`		`- adjustCheatsSubMenu(CurrentButton);`
	`694`	`+ adjustMenuNoPageEdit(CurrentButton);`
`695`	`695`	`break;`
`696`	`696`	`}`
`697`	`697`	`case A:`
`@@ -776,7 +776,7 @@ void menuCheckButton()`
`776`	`776`	`{`
`777`	`777`	`if (tempMenuSelectionStates == 0)`
`778`	`778`	`{`
`779`		`- adjustCheatsSubMenu(CurrentButton);`
	`779`	`+ adjustMenuNoPageEdit(CurrentButton);`
`780`	`780`	`}`
`781`	`781`	`break;`
`782`	`782`	`}`
`@@ -841,7 +841,7 @@ void menuCheckButton()`
`841`	`841`	`case DPADDOWN:`
`842`	`842`	`case DPADUP:`
`843`	`843`	`{`
`844`		`- adjustCheatsSubMenu(CurrentButton);`
	`844`	`+ adjustMenuNoPageEdit(CurrentButton);`
`845`	`845`	`break;`
`846`	`846`	`}`
`847`	`847`	`case A:`
`@@ -1092,7 +1092,7 @@ void menuCheckButton()`
`1092`	`1092`	`{`
`1093`	`1093`	`case 0:`
`1094`	`1094`	`{`
`1095`		`- adjustCheatsSubMenu(CurrentButton);`
	`1095`	`+ adjustMenuNoPageEdit(CurrentButton);`
`1096`	`1096`	`break;`
`1097`	`1097`	`}`
`1098`	`1098`	`case SELECT_AREA:`
Original file line number	Diff line number	Diff line change
`@@ -3346,7 +3346,7 @@ void default_DPAD_Actions(uint32_t button)`
`3346`	`3346`	`}`
`3347`	`3347`	`}*/`
`3348`	`3348`
`3349`		`-void adjustCheatsSubMenu(uint32_t button)`
	`3349`	`+void adjustMenuNoPageEdit(uint32_t button)`
`3350`	`3350`	`{`
`3351`	`3351`	`uint32_t tempCurrentMenu = CurrentMenu;`
`3352`	`3352`	`uint32_t tempTotalMenuColumns = Menu[tempCurrentMenu].TotalMenuColumns;`