Added in options to change actor held items in battle

Author: Zephiles

USER_MANUAL.md

@@ -16,7 +16,7 @@
 * Copy the GCI containing the Practice Codes to the memory card. (This file contains only code required to run the Practice codes. It has no relation to the standard TTYD save file.)
   * For **Dolphin** users:
     * Use the memcard manager located in **Tools > Memcard Manager (GC)** to import the GCI into the file Dolphin is using for a memory card.
-    * Alternatively, select "GCI Folder" for the format of the memory card in Slot A (in **Config dialog > GameCube > Device settings**), and copy the .gci file directly into the folder, located by default at **{Dolphin directory}/GC/<Region>/Card A**. *<Region>* will either be USA, JAP, or EUR depending on the region of the game that you're using.
+    * Alternatively, select "GCI Folder" for the format of the memory card in Slot A (in **Config dialog > GameCube > Device settings**), and copy the .gci file directly into the folder, located by default at **{Dolphin directory}/GC/{Region}/Card A**. **{Region}** will either be USA, JAP, or EUR depending on the region of the game that you're using.
   * For **Nintendont** or other console users:
     * Use the appropriate homebrew apps / folders, etc. to copy the file from your SD card to your GC memory card or virtual memory card.
 * Use the Gecko loader cheat code in the "relloader-ttyd" directory to make the game load the Practice Codes GCI.
@@ -59,8 +59,9 @@ This menu allows you to modify your entire inventory, including standard items,
 This menu allows you to modify Mario's stats, all of your partner's stats, whether or not partners are enabled or not, whether a partner is out or not, and whether or not a follower is out or not.
 
 ### Battles
-This menu allows you to change the HP, Max HP, FP, Max FP, and statuses of anyone in a battle (refered to as Actors).
+This menu allows you to change the HP, Max HP, FP, Max FP, held items, and statuses of anyone in a battle (refered to as Actors).
 * Note: This menu can only be used while in a battle. 
+* Note 2: Under certain circumstances, it is possible that having an actor recover using a Life Shroom can cause the game to softlock. It is believed that this only occurs when a textbox is supposed to occur, but the Life Shroom interrupts it. One example of where this happens is with Bowser in Chapter 8.
 
 ### Displays
 1. **On-Screen Timer** displays a timer at the bottom-right of the screen. This timer is set to run at the current FPS, and therefore will count from 0 to 59 (0 to 49 for EU at 50hz) before reaching one second.

ttyd-tools/rel/include/draw.h

@@ -44,6 +44,7 @@ void drawFollowersOptions();
 void drawMarioStats();
 void drawPartnerStats();
 void drawBattlesActorStats();
+void drawBattlesActorsHeldItem();
 void drawCurrentFollowerOut();
 void drawBattlesActorsList();
 void drawBattlesStatusesList();

ttyd-tools/rel/include/global.h

@@ -172,6 +172,8 @@ enum BATTLES_CURRENT_ACTOR_STATS_SELECTION
 	CHANGE_ACTOR_MAX_HP,
 	CHANGE_ACTOR_FP,
 	CHANGE_ACTOR_MAX_FP,
+	CHANGE_HELD_ITEM,
+	CLEAR_HELD_ITEM,
 	CHANGE_ACTOR_STATUSES,
 };
 

ttyd-tools/rel/source/draw.cpp

@@ -1099,6 +1099,79 @@ void drawBattlesActorStats()
 	}
 }
 
+void drawBattlesActorsHeldItem()
+{
+	// Get the starting address for the current actor
+	uint32_t ActorAddress = reinterpret_cast<uint32_t>(getActorPointer(MenuSelectedOption));
+	if (ActorAddress == 0)
+	{
+		return;
+	}
+	
+	// Only run when not displaying for Mario or the partners
+	/*uint32_t CurrentActorId = *reinterpret_cast<uint32_t *>(ActorAddress + 0x8);
+	const uint32_t MarioId 		= 222;
+	const uint32_t GoombellaId 	= 224;
+	const uint32_t MowzId 		= 230;
+	
+	if ((CurrentActorId == MarioId) || 
+		((CurrentActorId >= GoombellaId) && 
+			(CurrentActorId <= MowzId)))
+	{
+		return;
+	}*/
+	
+	uint8_t Alpha 	= 0xFF;
+	uint32_t Color 	= 0xFFFFFFFF;
+	int32_t PosX 	= -50;
+	int32_t PosY 	= 80;
+	float Scale 	= 0.6;
+	
+	// Draw the text for showing what the current item is
+	const char *CurrentLine = "Current Held Item";
+	drawText(CurrentLine, PosX, PosY, Alpha, Color, Scale);
+	
+	// Draw the current item icon
+	// Make sure the actor is actually holding an item
+	#ifdef TTYD_US
+	uint32_t offset = 0x308;
+	#elif defined TTYD_JP
+	uint32_t offset = 0x304;
+	#elif defined TTYD_EU
+	uint32_t offset = 0x30C;
+	#endif
+	
+	int32_t tempitem = *reinterpret_cast<uint32_t *>(ActorAddress + offset);
+	if (tempitem > 0)
+	{
+		PosX += 10;
+		PosY -= 45;
+		
+		// Set up array to use for displaying icons
+		int32_t IconPosition[3];
+		const int32_t IconPositionX 	= 0;
+		const int32_t IconPositionY 	= 1;
+		IconPosition[IconPositionX] 	= PosX;
+		IconPosition[IconPositionY] 	= PosY;
+		IconPosition[2] 				= 0;
+		
+		drawIconFromItem(IconPosition, tempitem, Scale);
+		
+		// Draw the text for the item
+		PosX += 17;
+		PosY += 18;
+		const char *ItemName = getItemName(tempitem);
+		
+		drawText(ItemName, PosX, PosY, Alpha, Color, Scale);
+	}
+	else
+	{
+		PosY -= 20;
+		
+		drawText("None", PosX, PosY, Alpha, Color, Scale);
+	}
+}
+
 void drawCurrentFollowerOut()
 {
 	// Draw the text for the current follower out
@@ -2658,7 +2731,7 @@ void drawTitleScreenInfo()
 	PosX 					+= 113;
 	PosY 					-= 14;
 
-	const char *String = "Practice Codes v3.0.3\nCreated by Zephiles";
+	const char *String = "Practice Codes v3.0.4\nCreated by Zephiles";
 	drawText(String, PosX, PosY, Alpha, TextColor, Scale);
 }
 

ttyd-tools/rel/source/global.cpp

@@ -523,6 +523,8 @@ const char *BattlesCurrentActorLines[] =
 	"Change Max HP",
 	"Change FP",
 	"Change Max FP",
+	"Change Held Item",
+	"Clear Held Item",
 	"Change Statuses",
 };
 

ttyd-tools/rel/source/menu.cpp

@@ -1478,8 +1478,29 @@ void menuCheckButton()
 						{
 							if (tempSelectedOption == 0)
 							{
+								uint32_t ActorAddress = reinterpret_cast<uint32_t>(
+									getActorPointer(tempMenuSelectedOption));
+								
 								switch (tempCurrentMenuOption)
 								{
+									case CLEAR_HELD_ITEM:
+									{
+										if (ActorAddress == 0)
+										{
+											break;
+										}
+										
+										#ifdef TTYD_US
+										uint32_t offset = 0x308;
+										#elif defined TTYD_JP
+										uint32_t offset = 0x304;
+										#elif defined TTYD_EU
+										uint32_t offset = 0x30C;
+										#endif
+										
+										*reinterpret_cast<uint32_t *>(ActorAddress + offset) = 0;
+										break;
+									}
 									case CHANGE_ACTOR_STATUSES:
 									{
 										// Go to the next menu
@@ -1492,8 +1513,6 @@ void menuCheckButton()
 										SelectedOption = tempCurrentMenuOption;
 										SecondaryMenuOption = getHighestAdjustableValueDigit(tempCurrentMenu) - 1;
 
-										uint32_t ActorAddress = reinterpret_cast<uint32_t>(
-											getActorPointer(tempMenuSelectedOption));
 										if (ActorAddress == 0)
 										{
 											break;
@@ -1525,6 +1544,20 @@ void menuCheckButton()
 													ActorAddress + 0x10E);
 												break;
 											}
+											case CHANGE_HELD_ITEM:
+											{
+												#ifdef TTYD_US
+												uint32_t offset = 0x308;
+												#elif defined TTYD_JP
+												uint32_t offset = 0x304;
+												#elif defined TTYD_EU
+												uint32_t offset = 0x30C;
+												#endif
+												
+												MenuSecondaryValue = *reinterpret_cast<int32_t *>(
+													ActorAddress + offset);
+												break;
+											}
 											default:
 											{
 												break;
@@ -2347,9 +2380,22 @@ void drawMenu()
 				// Draw the HP/FP values
 				drawBattlesActorStats();
 
+				// Draw the current held item
+				drawBattlesActorsHeldItem();
+				
 				if (tempSelectedOption > 0)
 				{
-					drawAdjustableValue(false, tempCurrentMenu);
+					bool ChangingItem;
+					if (tempSelectedOption == CHANGE_HELD_ITEM)
+					{
+						ChangingItem = true;
+					}
+					else
+					{
+						ChangingItem = false;
+					}
+					
+					drawAdjustableValue(ChangingItem, tempCurrentMenu);
 				}
 			}
 

ttyd-tools/rel/source/menufunctions.cpp

@@ -374,6 +374,12 @@ int32_t *getUpperAndLowerBounds(int32_t *tempArray, uint32_t currentMenu)
 					UpperBound = *reinterpret_cast<int16_t *>(ActorAddress + 0x10E); // Max FP
 					break;
 				}
+				case CHANGE_HELD_ITEM:
+				{
+					LowerBound = ThunderBolt;
+					UpperBound = Cake;
+					break;
+				}
 				default:
 				{
 					UpperBound = 999;
@@ -1429,22 +1435,48 @@ void adjustMenuItemBoundsMain(int32_t valueChangedBy, int32_t lowerBound, int32_
 
 void adjustMenuItemBounds(int32_t valueChangedBy, uint32_t currentMenu)
 {
-	if (currentMenu == CHEATS_NPC_FORCE_DROP)
+	int32_t tempMenuSecondaryValue = MenuSecondaryValue + valueChangedBy;
+	switch (currentMenu)
 	{
-		int32_t tempMenuSecondaryValue = MenuSecondaryValue + valueChangedBy;
-		
-		if ((tempMenuSecondaryValue > FreshJuice) && 
-			(tempMenuSecondaryValue < PowerJump))
+		case CHEATS_NPC_FORCE_DROP:
 		{
-			if (valueChangedBy > 0)
+			if ((tempMenuSecondaryValue > FreshJuice) && 
+				(tempMenuSecondaryValue < PowerJump))
 			{
-				MenuSecondaryValue = PowerJump;
+				if (valueChangedBy > 0)
+				{
+					MenuSecondaryValue = PowerJump;
+				}
+				else
+				{
+					MenuSecondaryValue = FreshJuice;
+				}
+				return;
 			}
-			else
+			break;
+		}
+		case BATTLES_CURRENT_ACTOR:
+		{
+			if (SelectedOption == CHANGE_HELD_ITEM)
 			{
-				MenuSecondaryValue = FreshJuice;
+				if (tempMenuSecondaryValue == TradeOff)
+				{
+					if (valueChangedBy > 0)
+					{
+						MenuSecondaryValue = tempMenuSecondaryValue + 1;
+					}
+					else
+					{
+						MenuSecondaryValue = tempMenuSecondaryValue - 1;
+					}
+					return;
+				}
 			}
-			return;
+			break;
+		}
+		default:
+		{
+			break;
 		}
 	}
 
@@ -1732,6 +1764,19 @@ void setBattlesActorValue(uint32_t currentMenuOption)
 				static_cast<int16_t>(tempMenuSecondaryValue);
 			break;
 		}
+		case CHANGE_HELD_ITEM:
+		{
+			#ifdef TTYD_US
+			uint32_t offset = 0x308;
+			#elif defined TTYD_JP
+			uint32_t offset = 0x304;
+			#elif defined TTYD_EU
+			uint32_t offset = 0x30C;
+			#endif
+			
+			*reinterpret_cast<int32_t *>(ActorAddress + offset) = tempMenuSecondaryValue;
+			break;
+		}
 		default:
 		{
 			break;