Check for valid button combos for cheats/displays

For the cheats/displays that use button combos, check to see if a button combo is set, and set the default if there isn't one set.

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -598,6 +598,8 @@ extern bool MarioFreeze;
 extern uint16_t JumpStorageSetCounter;
 
 void initMenuVars();
+void assignCheatButtonCombo(uint32_t cheat);
+void assignDisplayButtonCombo(uint32_t display);
 void initArtAttackAssemblyOverwrites();
 void initAssemblyOverwrites();
 

ttyd-tools/rel/source/global.cpp

@@ -1061,24 +1061,137 @@ void initMenuVars()
 		// Cheat[BOBBERY_EARLY].Active 						= false;
 		Cheat[FORCE_ITEM_DROP].Active 						= false;
 
-		Cheat[WALK_THROUGH_WALLS].ButtonCombo 				= PAD_Z;
-		Cheat[SAVE_COORDINATES].ButtonCombo 				= PAD_L | PAD_DPAD_LEFT;
-		Cheat[LOAD_COORDINATES].ButtonCombo 				= PAD_L | PAD_DPAD_UP;
-		Cheat[SAVE_ANYWHERE].ButtonCombo 					= PAD_Y | PAD_B;
-		Cheat[TEXT_STORAGE].ButtonCombo 					= PAD_L | PAD_X;
-		Cheat[TIME_STOP_TEXT_STORAGE].ButtonCombo 			= PAD_L | PAD_R;
-		Cheat[SPEED_UP_MARIO].ButtonCombo 					= PAD_L | PAD_Y;
-		Cheat[DISABLE_BATTLES].ButtonCombo 					= PAD_Y;
-		Cheat[AUTO_ACTION_COMMANDS].ButtonCombo 			= PAD_R;
-		Cheat[INFINITE_ITEM_USAGE].ButtonCombo 				= PAD_Y;
-		Cheat[RELOAD_ROOM].ButtonCombo 						= PAD_L | PAD_B;
-		Cheat[LEVITATE].ButtonCombo 						= PAD_L | PAD_A;
-		Cheat[SPAWN_ITEM].ButtonCombo 						= PAD_L | PAD_DPAD_DOWN;
-		
 		Displays[GUARD_SUPERGUARD_TIMINGS] 					= true;
-		
-		OnScreenTimer.ButtonCombo[START_PAUSE_RESUME] 		= PAD_L | PAD_Z;
-		OnScreenTimer.ButtonCombo[RESET] 					= PAD_L | PAD_DPAD_RIGHT;
+	}
+	
+	// Assign the cheats a button combo if they don't already have one
+	uint32_t Size = sizeof(Cheat) / sizeof(Cheat[0]);
+	for (uint32_t i = 0; i < Size; i++)
+	{
+		// Don't assign if the cheat already has a button combo
+		if (!Cheat[i].ButtonCombo)
+		{
+			assignCheatButtonCombo(i);
+		}
+	}
+	
+	// Assign the displays a button combo if they don't already have one
+	Size = sizeof(Displays);
+	for (uint32_t i = 0; i < Size; i++)
+	{
+		// Don't assign if the display already has a button combo
+		if (i == ONSCREEN_TIMER)
+		{
+			if (!OnScreenTimer.ButtonCombo[START_PAUSE_RESUME] ||
+				!OnScreenTimer.ButtonCombo[RESET])
+			{
+				assignDisplayButtonCombo(i);
+			}
+		}
+		else
+		{
+			// Extra checks will be added when more displays that use button combos are added
+		}
+	}
+}
+
+void assignCheatButtonCombo(uint32_t cheat)
+{
+	switch (cheat)
+	{
+		case WALK_THROUGH_WALLS:
+		{
+			Cheat[cheat].ButtonCombo = PAD_Z;
+			break;
+		}
+		case SAVE_COORDINATES:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_DPAD_LEFT;
+			break;
+		}
+		case LOAD_COORDINATES:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_DPAD_UP;
+			break;
+		}
+		case SAVE_ANYWHERE:
+		{
+			Cheat[cheat].ButtonCombo = PAD_Y | PAD_B;
+			break;
+		}
+		case TEXT_STORAGE:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_X;
+			break;
+		}
+		case TIME_STOP_TEXT_STORAGE:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_R;
+			break;
+		}
+		case SPEED_UP_MARIO:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_Y;
+			break;
+		}
+		case DISABLE_BATTLES:
+		{
+			Cheat[cheat].ButtonCombo = PAD_Y;
+			break;
+		}
+		case AUTO_ACTION_COMMANDS:
+		{
+			Cheat[cheat].ButtonCombo = PAD_R;
+			break;
+		}
+		case INFINITE_ITEM_USAGE:
+		{
+			Cheat[cheat].ButtonCombo = PAD_Y;
+			break;
+		}
+		case RELOAD_ROOM:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_B;
+			break;
+		}
+		case LEVITATE:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_A;
+			break;
+		}
+		case SPAWN_ITEM:
+		{
+			Cheat[cheat].ButtonCombo = PAD_L | PAD_DPAD_DOWN;
+			break;
+		}
+		default:
+		{
+			return;
+		}
+	}
+}
+
+void assignDisplayButtonCombo(uint32_t display)
+{
+	switch (display)
+	{
+		case ONSCREEN_TIMER:
+		{
+			if (!OnScreenTimer.ButtonCombo[START_PAUSE_RESUME])
+			{
+				OnScreenTimer.ButtonCombo[START_PAUSE_RESUME] 	= PAD_L | PAD_Z;
+			}
+			
+			if (!OnScreenTimer.ButtonCombo[RESET])
+			{
+				OnScreenTimer.ButtonCombo[RESET] 				= PAD_L | PAD_DPAD_RIGHT;
+			}
+			break;
+		}
+		default:
+		{
+			return;
+		}
 	}
 }
 

ttyd-tools/rel/source/memcard.cpp

@@ -210,7 +210,7 @@ int32_t writeSettings(char *description, char *fileName,
 			// Make sure the size being written does not exceed the current size
 			if (FileSizeAdjusted > StoredFileSizeAdjusted)
 			{
-				// The new size exceeds the current size, so a new file must be made created
+				// The new size exceeds the current size, so a new file must be created
 				// Close the file
 				ReturnCode = gc::card::CARDClose(fileInfo);
 				if (ReturnCode != CARD_ERROR_READY)