Bug Fix + Additional Actor Names

Fixed chests not being reset when flags are cleared. The flags are now only cleared during a screen transition.

Filled in more of the previously unknown actor names.

Author: Zephiles

ttyd-tools/rel/source/codes.cpp

@@ -587,6 +587,42 @@ void spawnItem()
 	}
 }
 
+void checkIfAreaFlagsShouldBeCleared()
+{
+	// Only run when the player has chosen to clear some flags
+	if (!ClearAreaFlags.FlagsShouldBeCleared)
+	{
+		return;
+	}
+	
+	// Check to see if currently in the process of clearing flags or not
+	if (!ClearAreaFlags.StartClearingFlags)
+	{
+		// Only run if currently in a screen transition
+		if (!checkForSpecificSeq(ttyd::seqdrv::SeqIndex::kMapChange))
+		{
+			return;
+		}
+		
+		// Set up the flags to be cleared
+		ClearAreaFlags.StartClearingFlags = true;
+	}
+	else
+	{
+		// Keep resetting the flags until the seq changes to Game
+		if (!checkForSpecificSeq(ttyd::seqdrv::SeqIndex::kGame))
+		{
+			// Clear the currently-selected flags
+			cheatClearAreaFlags(ClearAreaFlags.CurrentOption);
+		}
+		else
+		{
+			ClearAreaFlags.FlagsShouldBeCleared = false;
+			ClearAreaFlags.StartClearingFlags = false;
+		}
+	}
+}
+
 void displaySequenceInPauseMenu()
 {
 	uint32_t PauseMenuAddress = *reinterpret_cast<uint32_t *>(PauseMenuStartAddress);

ttyd-tools/rel/source/draw.cpp

@@ -2516,7 +2516,7 @@ void drawTitleScreenInfo()
 	PosX 					+= 113;
 	PosY 					-= 14;
 
-	const char *String = "Practice Codes v3.0.1\nCreated by Zephiles";
+	const char *String = "Practice Codes v3.0.2\nCreated by Zephiles";
 	drawText(String, PosX, PosY, Alpha, TextColor, Scale);
 }
 

ttyd-tools/rel/source/global.cpp

@@ -459,9 +459,9 @@ const char *BattlesActorsLines[] =
 	"Unknown 174",
 	"Unknown 175",
 	"Unknown 176",
-	"Unknown 177",
-	"Unknown 178",
-	"Unknown 179",
+	"Goombella - Action Commands Tutorial",
+	"Frankly - Action Commands Tutorial",
+	"Frankly - Special Moves Tutorial",
 	"Frankly - Goomba Trio Fight",
 	"Unknown 181",
 	"Unknown 182",
@@ -503,7 +503,7 @@ const char *BattlesActorsLines[] =
 	"Unknown 218",
 	"Bomb Squad - Bomb",
 	"System",
-	"Unknown 221",
+	"Goombella - Prologue - Lord Crump Fight",
 	"Mario",
 	"Shell Shield",
 	"Goombella",
@@ -735,8 +735,9 @@ struct AutoIncrement AdjustableValueMenu;
 struct CheatsHandleDisplayButtons CheatsDisplayButtons;
 struct MarioPartnerPositionsStruct MarioPartnerPositions;
 struct SaveAnywhereStruct SaveAnywhere;
-struct SpawnItems SpawnItem;
 struct ReloadRoomStruct ReloadRoom;
+struct SpawnItems SpawnItem;
+struct ClearAreaFlagsStruct ClearAreaFlags;
 struct TrickDisplay YoshiSkip;
 struct TrickDisplay PalaceSkip;
 struct OnScreenTimerDisplay OnScreenTimer;

ttyd-tools/rel/source/main.cpp

@@ -550,6 +550,7 @@ void Mod::run()
 	saveAnywhere(); // Needs to always run due to the script taking more than one frame
 	reloadRoom(); // Needs to always run due to the extra code that always does some failsafe checking
 	bobberyEarly();
+	checkIfAreaFlagsShouldBeCleared();
 
 	// Run each display function
 	// Only run if the mod menu isn't currently open

ttyd-tools/rel/source/menu.cpp

@@ -852,7 +852,8 @@ void menuCheckButton()
 										case 0:
 										{
 											// Selected yes
-											cheatClearAreaFlags();
+											ClearAreaFlags.CurrentOption = MenuSecondaryValue;
+											ClearAreaFlags.FlagsShouldBeCleared = true;
 											SelectedOption = 0;
 											break;
 										}
@@ -2230,7 +2231,7 @@ void drawMenu()
 			// Draw the window asking for confirmation to clear the flags
 			if (tempSelectedOption == CLEAR_FLAGS)
 			{
-				const char *ConfirmationMessage = "This will clear all of the GSWF's for the\nselected area. Are you sure you want\nto do this?";
+				const char *ConfirmationMessage = "This will clear all of the GSWF's for the\nselected area when the area is reloaded.\nAre you sure you want to do this?";
 				drawConfirmationWindow(ConfirmationMessage);
 			}
 			break;

ttyd-tools/rel/source/menufunctions.cpp

@@ -1980,12 +1980,12 @@ int32_t changeItem()
 	return 0;
 }
 
-void cheatClearAreaFlags()
+void cheatClearAreaFlags(uint32_t currentMenuOption)
 {
 	uint32_t LowerBound;
 	uint32_t UpperBound;
 
-	switch (MenuSecondaryValue)
+	switch (currentMenuOption)
 	{
 		case AREA_GOR:
 		{