Added an option to keep the player's standard items when warping by event

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -406,6 +406,7 @@ enum WARPS_IN_ADJUSTABLE_VALUE_MENU_OPTIONS
 enum WARPS_EVENT_OPTIONS
 {
 	EVENT_SELECT_EVENT = 1,
+	EVENT_KEEP_INVENTORY,
 	EVENT_WARP_NOW,
 };
 
@@ -690,7 +691,13 @@ struct SaveFileDecriptionInfo
 struct WarpByEventStruct
 {
 	int32_t CurrentIndex;
+	bool ShouldKeepInventory;
 	bool ShouldInit;
+	
+	WarpByEventStruct()
+	{
+		ShouldKeepInventory = true;
+	}
 };
 
 struct WarpByEventDetailsStruct

ttyd-tools/rel/source/draw.cpp

@@ -3406,7 +3406,29 @@ void drawWarpByEventMenuDetails()
 
 	const char *ExplainText = "Note: Warping via this menu will clear all game states.";
 	drawText(ExplainText, PosX, PosY, Alpha, Color, Scale);
-	PosY -= 100;
+	PosY -= 60;
+	
+	// Draw the text for whether the standard inventory is being kept or not
+	const char *String;
+	if (WarpByEvent.ShouldKeepInventory)
+	{
+		Color = 0x1BBE23FF;
+		String = "Yes";
+	}
+	else
+	{
+		Color = 0xFF1414FF;
+		String = "No";
+	}
+	
+	int32_t tempPosX = PosX + 222;
+	
+	#ifdef TTYD_JP
+	tempPosX -= 10;
+	#endif
+	
+	drawText(String, tempPosX, PosY, Alpha, Color, Scale);
+	PosY -= 60;
 
 	// Draw the details for the current event
 	drawEventDetails(PosX, PosY, WarpByEvent.CurrentIndex);

ttyd-tools/rel/source/global.cpp

@@ -1589,6 +1589,7 @@ const char *WarpDescriptions[] =
 const char *WarpEventLines[] = 
 {
 	"Select Event",
+	"Keep Standard Inventory",
 	"Warp",
 };
 

ttyd-tools/rel/source/menu.cpp

@@ -2739,6 +2739,13 @@ void menuCheckButton()
 									MenuVar.Timer = 0;
 									break;
 								}
+								case EVENT_KEEP_INVENTORY:
+								{
+									// Flip the bool
+									bool ShouldKeepInventory = WarpByEvent.ShouldKeepInventory;
+									WarpByEvent.ShouldKeepInventory = !ShouldKeepInventory;
+									break;
+								}
 								case EVENT_WARP_NOW:
 								{
 									int32_t ReturnCode = warpToMapByEvent(WarpByEvent.CurrentIndex);

ttyd-tools/rel/source/menufunctions.cpp

@@ -3433,7 +3433,8 @@ void *initStageEvents()
 	WarpByEvent.ShouldInit = false;
 	int32_t StageAndEventIds[2];
 
-	if (!indexToStageAndEvent(WarpByEvent.CurrentIndex, StageAndEventIds))
+	int32_t CurrentIndex = WarpByEvent.CurrentIndex;
+	if (!indexToStageAndEvent(CurrentIndex, StageAndEventIds))
 	{
 		// The overwritten instruction sets r3 to the global work pointer, so return the global work pointer
 		return ttyd::mariost::globalWorkPointer;
@@ -3448,6 +3449,19 @@ void *initStageEvents()
 		return ttyd::mariost::globalWorkPointer;
 	}
 
+	// Back up the standard inventory if desired
+	int16_t StandardInventory[20];
+	void *StandardInventoryStartPtr = nullptr;
+	
+	bool ShouldKeepInventory = WarpByEvent.ShouldKeepInventory;
+	if (ShouldKeepInventory)
+	{
+		StandardInventoryStartPtr = reinterpret_cast<void *>(
+			reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr()) + 0x192);
+		
+		memcpy(StandardInventory, StandardInventoryStartPtr, sizeof(StandardInventory));
+	}
+	
 	// Clear all current states
 	ttyd::swdrv::swInit();
 
@@ -3467,6 +3481,21 @@ void *initStageEvents()
 		}
 	}
 
+	// Restore the standard inventory if desired
+	if (ShouldKeepInventory)
+	{
+		memcpy(StandardInventoryStartPtr, StandardInventory, sizeof(StandardInventory));
+		
+		/* If the player warped to the event with the index of 278, then they should be 
+			given a Coconut, as it is used to get the Chuckola Cola from Flavio*/
+		
+		if (CurrentIndex == 278)
+		{
+			// Only add the item if the player has a free inventory slot for it
+			ttyd::mario_pouch::pouchGetItem(ttyd::item_data::Item::Coconut);
+		}
+	}
+	
 	// Set the Sequence to the value for the current event
 	setSequencePosition(getGsw0ForEvent(StageId, EventId));