Added an option to set specific flags when warping by an event

The flags that would be set are as follows:
1. Shop tutorial
2. Got first email
3. Read any email
4. Save block tutorial
5. Recovery block tutorial
6. Item tutorial

Author: Zephiles

ttyd-tools/rel/Makefile

@@ -54,7 +54,7 @@ MACHDEP		= -mno-sdata -mgcn -DGEKKO -mcpu=750 -meabi -mhard-float
 CFLAGS		= -nostdlib -ffreestanding -ffunction-sections -fdata-sections -g -Os -Wall -Werror $(MACHDEP) $(INCLUDE)
 CXXFLAGS	= -fno-exceptions -fno-rtti -std=gnu++17 $(CFLAGS)
 
-FUNCWRAPS	= -Wl,--wrap,sprintf -Wl,--wrap,strcmp -Wl,--wrap,strncmp -Wl,--wrap,strcpy -Wl,--wrap,strncpy -Wl,--wrap,strcat -Wl,--wrap,strlen -Wl,--wrap,memcpy -Wl,--wrap,memset -Wl,--wrap,sysMsec2Frame -Wl,--wrap,keyGetButton -Wl,--wrap,keyGetButtonTrg -Wl,--wrap,seqGetSeq -Wl,--wrap,seqGetNextSeq -Wl,--wrap,swByteGet -Wl,--wrap,swByteSet -Wl,--wrap,swClear -Wl,--wrap,marioStGetSystemLevel -Wl,--wrap,marioStSystemLevel -Wl,--wrap,marioGetPartyId -Wl,--wrap,marioGetExtraPartyId -Wl,--wrap,marioPartyEntry -Wl,--wrap,marioGetPtr -Wl,--wrap,pouchGetPtr -Wl,--wrap,btlGetScreenPoint -Wl,--wrap,evtGetWork -Wl,--wrap,eventStgNum -Wl,--wrap,eventStgDtPtr -Wl,--wrap,winGetPtr -Wl,--wrap,winOpenEnable -Wl,--wrap,CARDClose -Wl,--wrap,DCFlushRange -Wl,--wrap,ICInvalidateRange -Wl,--wrap,__udivdi3 -Wl,--wrap,__umoddi3
+FUNCWRAPS	= -Wl,--wrap,sprintf -Wl,--wrap,strcmp -Wl,--wrap,strncmp -Wl,--wrap,strcpy -Wl,--wrap,strncpy -Wl,--wrap,strcat -Wl,--wrap,strlen -Wl,--wrap,memcpy -Wl,--wrap,memset -Wl,--wrap,sysMsec2Frame -Wl,--wrap,keyGetButton -Wl,--wrap,keyGetButtonTrg -Wl,--wrap,seqGetSeq -Wl,--wrap,seqGetNextSeq -Wl,--wrap,swByteGet -Wl,--wrap,swByteSet -Wl,--wrap,swClear -Wl,--wrap,swSet -Wl,--wrap,marioStGetSystemLevel -Wl,--wrap,marioStSystemLevel -Wl,--wrap,marioGetPartyId -Wl,--wrap,marioGetExtraPartyId -Wl,--wrap,marioPartyEntry -Wl,--wrap,marioGetPtr -Wl,--wrap,pouchGetPtr -Wl,--wrap,btlGetScreenPoint -Wl,--wrap,evtGetWork -Wl,--wrap,eventStgNum -Wl,--wrap,eventStgDtPtr -Wl,--wrap,winGetPtr -Wl,--wrap,winOpenEnable -Wl,--wrap,CARDClose -Wl,--wrap,DCFlushRange -Wl,--wrap,ICInvalidateRange -Wl,--wrap,__udivdi3 -Wl,--wrap,__umoddi3
 
 LDFLAGS		= -r -e _prolog -u _prolog -u _epilog -u _unresolved -Wl,--gc-sections -nostdlib -g $(MACHDEP) -Wl,-Map,$(notdir $@).map $(FUNCWRAPS)
 

ttyd-tools/rel/include/global.h

@@ -407,6 +407,7 @@ enum WARPS_EVENT_OPTIONS
 {
 	EVENT_SELECT_EVENT = 1,
 	EVENT_KEEP_INVENTORY,
+	EVENT_SET_FLAGS,
 	EVENT_WARP_NOW,
 };
 
@@ -692,11 +693,13 @@ struct WarpByEventStruct
 {
 	int32_t CurrentIndex;
 	bool ShouldKeepInventory;
+	bool ShouldSetFlags;
 	bool ShouldInit;
 
 	WarpByEventStruct()
 	{
 		ShouldKeepInventory = true;
+		ShouldSetFlags = true;
 	}
 };
 

ttyd-tools/rel/source/draw.cpp

@@ -3408,7 +3408,7 @@ void drawWarpByEventMenuDetails()
 	drawText(ExplainText, PosX, PosY, Alpha, Color, Scale);
 	PosY -= 60;
 
-	// Draw the text for whether the standard inventory is being kept or not
+	// Draw the text for whether the standard inventory should be kept or not
 	const char *String;
 	if (WarpByEvent.ShouldKeepInventory)
 	{
@@ -3421,12 +3421,27 @@ void drawWarpByEventMenuDetails()
 		String = "No";
 	}
 
-	int32_t tempPosX = PosX + 222;
+	int32_t tempPosX = PosX + 232;
 
 	#ifdef TTYD_JP
 	tempPosX -= 10;
 	#endif
 
+	drawText(String, tempPosX, PosY, Alpha, Color, Scale);
+	PosY -= 20;
+	
+	// Draw the text for whether specific flags should be set or not
+	if (WarpByEvent.ShouldSetFlags)
+	{
+		Color = 0x1BBE23FF;
+		String = "Yes";
+	}
+	else
+	{
+		Color = 0xFF1414FF;
+		String = "No";
+	}
+	
 	drawText(String, tempPosX, PosY, Alpha, Color, Scale);
 	PosY -= 60;
 

ttyd-tools/rel/source/global.cpp

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

ttyd-tools/rel/source/menu.cpp

@@ -2746,6 +2746,13 @@ void menuCheckButton()
 									WarpByEvent.ShouldKeepInventory = !ShouldKeepInventory;
 									break;
 								}
+								case EVENT_SET_FLAGS:
+								{
+									// Flip the bool
+									bool ShouldSetFlags = WarpByEvent.ShouldSetFlags;
+									WarpByEvent.ShouldSetFlags = !ShouldSetFlags;
+									break;
+								}
 								case EVENT_WARP_NOW:
 								{
 									int32_t ReturnCode = warpToMapByEvent(WarpByEvent.CurrentIndex);

ttyd-tools/rel/source/menufunctions.cpp

@@ -3496,6 +3496,28 @@ void *initStageEvents()
 		}
 	}
 
+	// Set specific flags if desired
+	if (WarpByEvent.ShouldSetFlags)
+	{
+		// Set up the flags to set
+		static const uint16_t FlagsToSet[] = 
+		{
+			0, // Shop tutorial
+			37, // Got first email
+			38, // Read any email
+			233, // Save block tutorial
+			234, // Recovery block tutorial
+			235, // Item tutorial
+		};
+		
+		// Set the flags
+		uint32_t Size = sizeof(FlagsToSet) / sizeof(FlagsToSet[0]);
+		for (uint32_t i = 0; i < Size; i++)
+		{
+			ttyd::swdrv::swSet(FlagsToSet[i]);
+		}
+	}
+	
 	// Set the Sequence to the value for the current event
 	setSequencePosition(getGsw0ForEvent(StageId, EventId));
 

ttyd-tools/rel/source/wrappers.cpp

@@ -29,6 +29,7 @@ extern "C"
 	uint32_t __real_swByteGet(uint32_t gsw);
 	void __real_swByteSet(uint32_t gsw, uint32_t value);
 	void __real_swClear(uint32_t gswf);
+	void __real_swSet(uint32_t gswf);
 	uint32_t __real_marioStGetSystemLevel();
 	void __real_marioStSystemLevel(uint32_t level);
 	int32_t __real_marioGetPartyId();
@@ -155,6 +156,12 @@ extern "C"
 		__real_swClear(gswf);
 	}
 
+	// swSet
+	__attribute__((noinline)) void __wrap_swSet(uint32_t gswf)
+	{
+		__real_swSet(gswf);
+	}
+	
 	// marioStGetSystemLevel
 	__attribute__((noinline)) uint32_t __wrap_marioStGetSystemLevel()
 	{