Added a cheat for changing Yoshi colors

Also cleaned up some other code, including removing unnecessary uses of semicolons, not loading SecondaryMenuOption every time in some loops, and using non-static positioning with some displays.

Author: Zephiles

ttyd-tools/rel/include/commonfunctions.h

@@ -38,13 +38,15 @@ void *getPartnerPointer();
 void *getFollowerPointer();
 void removePartnerFromOverworld();
 void removeFollowerFromOverworld();
+uint32_t getCurrentYoshiColorId();
+void setNewYoshiColorId(uint32_t colorId);
 bool checkIfBadgeEquipped(int16_t badge);
 void recheckJumpAndHammerLevels();
 uint32_t getCurrentPitFloor();
 void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound);
 void clear_DC_IC_Cache(void *ptr, uint32_t size);
 bool checkIfPointerIsValid(void *ptr);
-void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmount);;
+void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmount);
 
 }
 

ttyd-tools/rel/include/draw.h

@@ -92,6 +92,8 @@ bool getSequenceStageAndEvent(const char **returnArray, uint32_t sequencePositio
 #endif
 
 void drawCheatsChangeSequence();
+void drawCheatsCurrentYoshiColor();
+void drawCheatsChangeYoshiColorOptions();
 void drawCheatsBool(int32_t posY);
 void drawButtonCombo(uint16_t buttonCombo, int32_t posY, const char *description);
 void drawChangeButtonCombo(uint16_t &currentButtonCombo);

ttyd-tools/rel/include/global.h

@@ -19,6 +19,7 @@ enum MENU_NAMES
 	WARPS,
 	INVENTORY_MAIN,
 	CHEATS_CHANGE_SEQUENCE,
+	CHEATS_CHANGE_YOSHI_COLOR,
 	CHEATS_STANDARD,
 	CHEATS_NO_BUTTON_COMBO,
 	CHEATS_NPC_FORCE_DROP,
@@ -79,6 +80,7 @@ enum CHEATS_OPTIONS
 	LEVITATE,
 	LOCK_MARIO_HP_TO_MAX,
 	RUN_FROM_BATTLES,
+	CHANGE_YOSHI_COLOR,
 	DISABLE_DPAD_OPTIONS_DISPLAY,
 	DISABLE_MENU_SOUNDS,
 	BOBBERY_EARLY,
@@ -633,8 +635,8 @@ struct WarpByIndexStruct
 	}
 };
 
-extern Menus Menu[27];
-extern Cheats Cheat[22];
+extern Menus Menu[28];
+extern Cheats Cheat[23];
 extern bool Displays[10];
 extern char DisplayBuffer[256];
 extern char HeapBuffer[1024];
@@ -662,6 +664,8 @@ extern WarpByIndexStruct WarpByIndex;
 extern const char *VersionNumber;
 extern uint8_t CheatsOrder[];
 extern const char *CheatsLines[];
+extern const char *CheatsYoshiColorOptionsLines[];
+extern uint8_t CheatsYoshiColorOptionsLinesSize;
 extern const char *CheatsForceItemDropAreas[];
 extern uint8_t CheatsForceItemDropAreasSize;
 extern const char *CheatsForceItemDropAreasFullNames[];

ttyd-tools/rel/include/menufunctions.h

@@ -36,6 +36,7 @@ uint32_t addByIconButtonControls(uint32_t currentMenu);
 uint32_t memoryAddressTypeButtonControls();
 uint32_t memoryChangeWatchPositionButtonControls();
 uint32_t marioSpecialMovesButtonControls();
+uint32_t cheatChangeYoshiColorButtonControls();
 uint32_t followersOptionsButtonControls();
 void adjustMenuItemBoundsMain(int32_t valueChangedBy, int32_t lowerBound, int32_t upperBound);
 void adjustMenuItemBounds(int32_t valueChangedBy, uint32_t currentMenu);

ttyd-tools/rel/include/ttyd.eu.lst

@@ -703,8 +703,8 @@
 // mario_pouch.o
 // 800D3BAC:pouchGetYoshiName
 // 800D3BF4:pouchSetYoshiName
-// 800D3C20:pouchSetPartyColor
-// 800D3C3C:pouchGetPartyColor
+800D3C20:pouchSetPartyColor
+800D3C3C:pouchGetPartyColor
 // 800D3C50:pouchCheckMail
 // 800D3CAC:pouchOpenMail
 // 800D3CEC:pouchReceiveMail

ttyd-tools/rel/include/ttyd.jp.lst

@@ -698,8 +698,8 @@
 // mario_pouch.o
 // 800CEC68:pouchGetYoshiName
 // 800CECB0:pouchSetYoshiName
-// 800CECDC:pouchSetPartyColor
-// 800CECF8:pouchGetPartyColor
+800CECDC:pouchSetPartyColor
+800CECF8:pouchGetPartyColor
 // 800CED0C:pouchCheckMail
 // 800CED68:pouchOpenMail
 // 800CEDA8:pouchReceiveMail

ttyd-tools/rel/include/ttyd.us.lst

@@ -702,8 +702,8 @@
 // mario_pouch.o
 // 800D2DB4:pouchGetYoshiName
 // 800D2DFC:pouchSetYoshiName
-// 800D2E28:pouchSetPartyColor
-// 800D2E44:pouchGetPartyColor
+800D2E28:pouchSetPartyColor
+800D2E44:pouchGetPartyColor
 // 800D2E58:pouchCheckMail
 // 800D2EB4:pouchOpenMail
 // 800D2EF4:pouchReceiveMail

ttyd-tools/rel/include/ttyd/mario_pouch.h

@@ -8,8 +8,8 @@ extern "C" {
 
 // pouchGetYoshiName
 // pouchSetYoshiName
-// pouchSetPartyColor
-// pouchGetPartyColor
+void pouchSetPartyColor(uint32_t partnerId, uint32_t colorId);
+uint32_t pouchGetPartyColor(uint32_t partnerId);
 // pouchCheckMail
 // pouchOpenMail
 // pouchReceiveMail

ttyd-tools/rel/source/commonfunctions.cpp

@@ -245,6 +245,26 @@ void removeFollowerFromOverworld()
 	ttyd::party::partyKill2(FollowerID);
 }
 
+uint32_t getCurrentYoshiColorId()
+{
+	const uint32_t YoshiPartnerId = 4;
+	return ttyd::mario_pouch::pouchGetPartyColor(YoshiPartnerId);
+}
+
+void setNewYoshiColorId(uint32_t colorId)
+{
+	// Make sure the desired color is valid
+	const uint32_t ColorIdWhite = 6;
+	if (colorId > ColorIdWhite)
+	{
+		// The desired color is not valid
+		return;
+	}
+	
+	const uint32_t YoshiPartnerId = 4;
+	ttyd::mario_pouch::pouchSetPartyColor(YoshiPartnerId, colorId);
+}
+
 bool checkIfBadgeEquipped(int16_t badge)
 {
 	return ttyd::mario_pouch::pouchEquipCheckBadge(badge) > 0;

ttyd-tools/rel/source/draw.cpp

@@ -670,8 +670,9 @@ void drawMarioSpecialMovesOptions()
 	drawText(HelpText, PosX, PosY, Alpha, Color, Scale);
 
 	// Set the values for the text to use
+	int32_t NewPosY = PosY - 54;
 	PosX += 25;
-	PosY = 90;
+	PosY = NewPosY;
 
 	// Set up array to use for displaying icons
 	int32_t IconPosition[3];
@@ -682,6 +683,7 @@ void drawMarioSpecialMovesOptions()
 	IconPosition[IconPositionY] 	= PosY - 18;
 
 	// Draw the icons and main text
+	uint32_t tempSecondaryMenuOption = SecondaryMenuOption;
 	int16_t SpecialMoveIcon;
 
 	for (uint32_t i = 0; i < 8; i++)
@@ -700,7 +702,7 @@ void drawMarioSpecialMovesOptions()
 		drawIconFromItem(IconPosition, SpecialMoveIcon, Scale);
 
 		// Draw the main text
-		if (SecondaryMenuOption == i)
+		if (tempSecondaryMenuOption == i)
 		{
 			Color = 0x5B59DEFF;
 		}
@@ -719,7 +721,7 @@ void drawMarioSpecialMovesOptions()
 	uint32_t PouchPtr = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
 	int16_t SpecialMovesBits = *reinterpret_cast<int16_t *>(PouchPtr + 0x8C);
 	PosX += 130;
-	PosY = 90;
+	PosY = NewPosY;
 
 	for (uint32_t i = 0; i < 8; i++)
 	{
@@ -771,9 +773,11 @@ void drawFollowersOptions()
 
 	// Draw the main text
 	uint32_t tempStatsFollowerOptionsLinesSize = StatsFollowerOptionsLinesSize;
+	uint32_t tempSecondaryMenuOption = SecondaryMenuOption;
+	
 	for (uint32_t i = 0; i < tempStatsFollowerOptionsLinesSize; i++)
 	{
-		if (SecondaryMenuOption == i)
+		if (tempSecondaryMenuOption == i)
 		{
 			Color = 0x5B59DEFF;
 		}
@@ -1469,9 +1473,11 @@ void drawMemoryTypeList()
 
 	// Draw the main text
 	uint32_t Size = MemoryTypeLinesSize;
+	uint32_t tempSecondaryMenuOption = SecondaryMenuOption;
+	
 	for (uint32_t i = 0; i < Size; i++)
 	{
-		if (SecondaryMenuOption == i)
+		if (tempSecondaryMenuOption == i)
 		{
 			Color = 0x5B59DEFF;
 		}
@@ -2257,9 +2263,10 @@ void drawAdjustableValue(bool changingItem, uint32_t currentMenu)
 	}
 
 	// Draw each digit of the number
+	uint32_t tempSecondaryMenuOption = SecondaryMenuOption;
 	for (uint32_t i = 0; i < AmountOfNumbers; i++)
 	{
-		if (SecondaryMenuOption == i)
+		if (tempSecondaryMenuOption == i)
 		{
 			color = 0x5B59DEFF;
 		}
@@ -2396,9 +2403,10 @@ void drawMemoryWatchAdjustableValue(uint32_t currentMenu)
 	drawText("0x", (x - 30), y, alpha, color, scale);
 
 	// Draw each digit of the number
+	uint32_t tempSecondaryMenuOption = SecondaryMenuOption;
 	for (uint32_t i = 0; i < AmountOfNumbers; i++)
 	{
-		if (SecondaryMenuOption == i)
+		if (tempSecondaryMenuOption == i)
 		{
 			color = 0x5B59DEFF;
 		}
@@ -2748,6 +2756,85 @@ void drawCheatsChangeSequence()
 	drawText(String, PosX, PosY, Alpha, Color, Scale);
 }
 
+void drawCheatsCurrentYoshiColor()
+{
+	uint32_t Color = 0xFFFFFFFF;
+	uint8_t Alpha = 0xFF;
+	int32_t PosX = -232;
+	int32_t PosY = 120;
+	float Scale = 0.6;
+	
+	// Get the current Yoshi color
+	uint32_t CurrentColorId = getCurrentYoshiColorId();
+	const char *CurrentColorString = "";
+	
+	// Make sure the current color is valid
+	const uint32_t ColorIdWhite = 6;
+	if (CurrentColorId <= ColorIdWhite)
+	{
+		CurrentColorString = CheatsYoshiColorOptionsLines[CurrentColorId];
+	}
+	
+	char *tempDisplayBuffer = DisplayBuffer;
+	sprintf(tempDisplayBuffer,
+		"Current Color: %s",
+		CurrentColorString);
+	
+	drawText(tempDisplayBuffer, PosX, PosY, Alpha, Color, Scale);
+	
+	// Draw the text stating that the player must change partners for the new color to take effect
+	const char *String = "You must swap partners for the new color to\ntake effect";
+	drawText(String, PosX, PosY - 40, Alpha, Color, Scale);
+}
+
+void drawCheatsChangeYoshiColorOptions()
+{
+	// Check for button inputs
+	cheatChangeYoshiColorButtonControls();
+	
+	// Draw the window
+	uint32_t Color 		= 0x151515F6;
+	int32_t PosX 		= -106;
+	int32_t PosY 		= 123;
+	int32_t Width 		= 212;
+	int32_t Height 		= 239;
+	int32_t Curve 		= 20;
+	
+	drawWindow(Color, PosX, PosY, Width, Height, Curve);
+	
+	// Draw the help text
+	const char *HelpText = "Press A to confirm\nPress B to cancel";
+	uint8_t Alpha = 0xFF;
+	float Scale = 0.6;
+	Color = 0xFFFFFFFF;
+	PosX += 30;
+	PosY -= 25;
+	
+	drawText(HelpText, PosX, PosY, Alpha, Color, Scale);
+	
+	// Set the values for the text to use
+	uint32_t tempSecondaryMenuOption = SecondaryMenuOption;
+	PosX += 47;
+	PosY -= 54;
+	
+	uint32_t Size = CheatsYoshiColorOptionsLinesSize;
+	for (uint32_t i = 0; i < Size; i++)
+	{
+		// Draw the main text
+		if (tempSecondaryMenuOption == i)
+		{
+			Color = 0x5B59DEFF;
+		}
+		else
+		{
+			Color = 0xFFFFFFFF;
+		}
+		
+		drawText(CheatsYoshiColorOptionsLines[i], PosX, PosY, Alpha, Color, Scale);
+		PosY -= 20;
+	}
+}
+
 void drawCheatsBool(int32_t posY)
 {
 	uint32_t tempMenuSelectedOption = MenuSelectedOption;