Removed the Choose Actor option in the Battles menu

Author: Zephiles

ttyd-tools/rel/source/draw.cpp

@@ -1886,19 +1886,15 @@ void drawBattlesActorsList()
 {
 	uint32_t tempCurrentPage 		= CurrentPage;
 	uint32_t TotalMenuOptions 		= 62; // Excluding System
-	uint32_t MaxOptionsPerPage 		= 14;
+	uint32_t MaxOptionsPerPage 		= 18;
 	uint32_t IndexStart 			= tempCurrentPage * MaxOptionsPerPage;
 
 	uint8_t Alpha 	= 0xFF;
 	int32_t PosX 	= -232;
-	int32_t PosY 	= 140;
+	int32_t PosY 	= 180;
 	float Scale 	= 0.6;
 	uint32_t Color;
 
-	// Draw the current page
-	drawPageNumber(PosX, PosY, tempCurrentPage);
-	PosY -= 40;
-	
 	// Draw the main text
 	for (uint32_t i = IndexStart; i < (IndexStart + MaxOptionsPerPage); i++)
 	{
@@ -1933,7 +1929,7 @@ void drawBattlesActorsList()
 			}
 		}
 
-		if ((CurrentMenuOption == i) && (SelectedOption != 0))
+		if (CurrentMenuOption == i)
 		{
 			Color = 0x5B59DEFF;
 		}

ttyd-tools/rel/source/global.cpp

@@ -783,11 +783,6 @@ const char *MemoryChangeAddressLines[] =
 	"Remove Pointer Level",
 };
 
-const char *BattlesLines[] = 
-{
-	"Choose Actor",
-};
-
 const char *BattlesActorsLines[] = 
 {
 	"Goomba",
@@ -1434,10 +1429,7 @@ void initMenuVars()
 	Menu[MEMORY_CHANGE_ADDRESS].PreviousMenu 			= MEMORY_MODIFY;
 	Menu[MEMORY_CHANGE_ADDRESS].Line 					= MemoryChangeAddressLines;
 
-	Menu[BATTLES].TotalMenuOptions 						= sizeof(BattlesLines) / sizeof(BattlesLines[0]);
-	Menu[BATTLES].ColumnSplitAmount 					= Menu[BATTLES].TotalMenuOptions;
 	Menu[BATTLES].PreviousMenu 							= ROOT;
-	Menu[BATTLES].Line 									= BattlesLines;
 
 	Menu[BATTLES_CURRENT_ACTOR].TotalMenuOptions 		= sizeof(BattlesCurrentActorLines) / sizeof(BattlesCurrentActorLines[0]);
 	Menu[BATTLES_CURRENT_ACTOR].ColumnSplitAmount 		= Menu[BATTLES_CURRENT_ACTOR].TotalMenuOptions;

ttyd-tools/rel/source/menu.cpp

@@ -2019,61 +2019,32 @@ void menuCheckButton()
 			}
 			else
 			{
-				uint32_t MaxOptionsPerPage = 14;
 				switch (CurrentButton)
 				{
 					case DPADDOWN:
 					case DPADUP:
 					{
-						if (tempSelectedOption != 0)
-						{
-							adjustBattlesActorSelection(CurrentButton);
-						}
+						adjustBattlesActorSelection(CurrentButton);
 						break;
 					}
 					case A:
 					{
-						switch (tempSelectedOption)
+						// Make sure the current slot isn't empty
+						void *CurrentActorPointer = getActorPointer(tempCurrentMenuOption + 1); // Add 1 to skip System
+						if (CurrentActorPointer)
 						{
-							case 0:
-							{
-								SelectedOption 		= tempCurrentMenuOption + 1;
-								CurrentMenuOption 	= tempCurrentPage * MaxOptionsPerPage;
-								break;
-							}
-							default:
-							{
-								// Make sure the current slot isn't empty
-								void *CurrentActorPointer = getActorPointer(tempCurrentMenuOption + 1); // Add 1 to skip System
-								if (CurrentActorPointer)
-								{
-									// Go to the next menu
-									CurrentMenu = BATTLES_CURRENT_ACTOR;
-									MenuSelectedOption = tempCurrentMenuOption + 1; // Add 1 to skip System
-									resetMenu();
-								}
-								break;
-							}
+							// Go to the next menu
+							CurrentMenu = BATTLES_CURRENT_ACTOR;
+							MenuSelectedOption = tempCurrentMenuOption + 1; // Add 1 to skip System
+							resetMenu();
 						}
 						break;
 					}
 					case B:
 					{
-						switch (tempSelectedOption)
-						{
-							case 0:
-							{
-								// Go back to the previous menu
-								CurrentMenu = tempPreviousMenu;
-								resetMenu();
-								break;
-							}
-							default:
-							{
-								closeSecondaryMenu();
-								break;
-							}
-						}
+						// Go back to the previous menu
+						CurrentMenu = tempPreviousMenu;
+						resetMenu();
 						break;
 					}
 					default:
@@ -3258,7 +3229,12 @@ void drawMenu()
 			else
 			{
 				// Draw the text for the options
-				drawSingleColumnSelectedOption();
+				drawSingleColumnMain();
+				
+				// Draw the page number
+				int32_t PosX = 150;
+				int32_t PosY = 180;
+				drawPageNumber(PosX, PosY, tempCurrentPage);
 
 				// Draw each actor
 				drawBattlesActorsList();

ttyd-tools/rel/source/menufunctions.cpp

@@ -3683,7 +3683,7 @@ void adjustBattlesActorSelection(uint32_t button)
 {
 	// Get the highest slot in use
 	uint32_t TotalMenuOptions = 62;
-	uint32_t MaxOptionsPerPage = 14;
+	uint32_t MaxOptionsPerPage = 18;
 	int32_t HighestSlot = 0;
 
 	for (uint32_t i = 1; i <= TotalMenuOptions; i++) // Start at 1 to skip System