Reset the partner menu if manually changing Yoshi's color

Author: Zephiles

ttyd-tools/rel/include/menufunctions.h

@@ -16,6 +16,7 @@ void resetMenu();
 void resetMenuToRoot();
 void resetAndCloseSecondaryMenu();
 void resetImportantItemsPauseMenu();
+void resetPartnerPauseMenu();
 void recheckUpgradesBattles(int32_t item);
 
 void raiseSystemLevel();

ttyd-tools/rel/source/menu.cpp

@@ -12,7 +12,6 @@
 #include <ttyd/evt_yuugijou.h>
 #include <ttyd/mario_pouch.h>
 #include <ttyd/mariost.h>
-#include <ttyd/win_party.h>
 #include <ttyd/win_main.h>
 #include <ttyd/party.h>
 
@@ -1318,14 +1317,8 @@ void menuCheckButton()
 
 											*AddressToChange = !*AddressToChange;
 
-											// Reset the partner menu if the pause menu is open
-											uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();
-											if (SystemLevel == 15)
-											{
-												void *PauseMenuPointer = ttyd::win_main::winGetPtr();
-												ttyd::win_party::winPartyExit(PauseMenuPointer);
-												ttyd::win_party::winPartyInit(PauseMenuPointer);
-											}
+											// Reset the partner menu
+											resetPartnerPauseMenu();
 											break;
 										}
 										case TOGGLE + 1:

ttyd-tools/rel/source/menufunctions.cpp

@@ -7,6 +7,7 @@
 #include <ttyd/win_main.h>
 #include <ttyd/mariost.h>
 #include <ttyd/win_item.h>
+#include <ttyd/win_party.h>
 #include <ttyd/seqdrv.h>
 #include <ttyd/item_data.h>
 #include <ttyd/msgdrv.h>
@@ -149,10 +150,10 @@ void resetImportantItemsPauseMenu()
 	uint32_t ImportantItemsSubMenu = *reinterpret_cast<uint32_t *>(
 		reinterpret_cast<uint32_t>(PauseMenuPointer) + 0x210);
 
-	// Reset the item menu
+	// Clear the item menu
 	ttyd::win_item::winItemExit(PauseMenuPointer);
 
-	// Re-init the menu
+	// Re-init the item menu
 	ttyd::win_item::winItemInit(PauseMenuPointer);
 
 	// Restore the submenu
@@ -161,6 +162,25 @@ void resetImportantItemsPauseMenu()
 			0x210) = ImportantItemsSubMenu;
 }
 
+void resetPartnerPauseMenu()
+{
+	// Only run if the pause menu is currently open
+	uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();
+	if (SystemLevel != 15)
+	{
+		// The pause menu is not open, so do nothing
+		return;
+	}
+	
+	void *PauseMenuPointer = ttyd::win_main::winGetPtr();
+	
+	// Clear the party menu
+	ttyd::win_party::winPartyExit(PauseMenuPointer);
+	
+	// Re-init the party menu
+	ttyd::win_party::winPartyInit(PauseMenuPointer);
+}
+
 void recheckUpgradesBattles(int32_t item)
 {
 	// Only run while in a battle
@@ -1750,6 +1770,9 @@ uint32_t partnerChangeYoshiColorButtonControls()
 		{
 			setNewYoshiColorId(MenuVar.SecondaryMenuOption);
 
+			// Reset the partner menu
+			resetPartnerPauseMenu();
+			
 			MenuVar.MenuSelectedOption = 0;
 
 			MenuVar.FrameCounter = 1;