Added an option to keep your badges when warping by event

Zephiles · Zephiles · commit 98dfa098034d · 2019-10-15T04:35:24.000-05:00
This option is added onto the Keep Standard Inventory option, which has been renamed to Keep Inventory.
diff --git a/ttyd-tools/rel/include/commonfunctions.h b/ttyd-tools/rel/include/commonfunctions.h
@@ -39,6 +39,7 @@ uint32_t getCurrentYoshiColorId();
 void setNewYoshiColorId(uint32_t colorId);
 void spawnFollower(ttyd::party::PartyMembers followerId);
 bool checkIfBadgeEquipped(int16_t badge);
+bool checkIfHaveItem(int16_t item);
 void recheckJumpAndHammerLevels();
 uint32_t getCurrentPitFloor();
 uint32_t getCurrentFPS();
diff --git a/ttyd-tools/rel/include/global.h b/ttyd-tools/rel/include/global.h
@@ -703,6 +703,12 @@ struct WarpByEventStruct
 	}
 };
 
+struct WarpByEventInventoryStruct
+{
+	int16_t StandardItems[20];
+	int16_t Badges[200];
+};
+
 struct WarpByEventDetailsStruct
 {
 	#ifdef TTYD_JP
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -933,8 +933,8 @@
 // 800D3FC0:pouchGetKpaCoin
 // 800D3FCC:pouchMajinaiInit
 // 800D3FFC:pouchArriveBadge
-// 800D402C:pouchUnEquipBadgeID
-// 800D4084:pouchEquipBadgeID
+800D402C:pouchUnEquipBadgeID
+800D4084:pouchEquipBadgeID
 // 800D40D8:pouchEquipCheckBadgeIndex
 800D40F8:pouchEquipCheckBadge
 // 800D41C0:pouchUnEquipBadgeIndex
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -931,8 +931,8 @@
 // 800CF07C:pouchGetKpaCoin
 // 800CF088:pouchMajinaiInit
 // 800CF0B8:pouchArriveBadge
-// 800CF0E8:pouchUnEquipBadgeID
-// 800CF140:pouchEquipBadgeID
+800CF0E8:pouchUnEquipBadgeID
+800CF140:pouchEquipBadgeID
 // 800CF194:pouchEquipCheckBadgeIndex
 800CF1B4:pouchEquipCheckBadge
 // 800CF27C:pouchUnEquipBadgeIndex
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -931,8 +931,8 @@
 // 800D31C8:pouchGetKpaCoin
 // 800D31D4:pouchMajinaiInit
 // 800D3204:pouchArriveBadge
-// 800D3234:pouchUnEquipBadgeID
-// 800D328C:pouchEquipBadgeID
+800D3234:pouchUnEquipBadgeID
+800D328C:pouchEquipBadgeID
 // 800D32E0:pouchEquipCheckBadgeIndex
 800D3300:pouchEquipCheckBadge
 // 800D33C8:pouchUnEquipBadgeIndex
diff --git a/ttyd-tools/rel/include/ttyd/mario_pouch.h b/ttyd-tools/rel/include/ttyd/mario_pouch.h
@@ -21,8 +21,8 @@ void pouchGetStarStone(uint32_t starId);
 // pouchGetKpaCoin
 // pouchMajinaiInit
 // pouchArriveBadge
-// pouchUnEquipBadgeID
-// pouchEquipBadgeID
+bool pouchUnEquipBadgeID(int16_t badge);
+bool pouchEquipBadgeID(int16_t badge);
 // pouchEquipCheckBadgeIndex
 uint32_t pouchEquipCheckBadge(int16_t badge);
 // pouchUnEquipBadgeIndex
diff --git a/ttyd-tools/rel/source/commonfunctions.cpp b/ttyd-tools/rel/source/commonfunctions.cpp
@@ -263,6 +263,11 @@ bool checkIfBadgeEquipped(int16_t badge)
 	return ttyd::mario_pouch::pouchEquipCheckBadge(badge) > 0;
 }
 
+bool checkIfHaveItem(int16_t item)
+{
+	return ttyd::mario_pouch::pouchCheckItem(item) > 0;
+}
+
 void recheckJumpAndHammerLevels()
 {
 	ttyd::mario_pouch::pouchGetJumpLv();
diff --git a/ttyd-tools/rel/source/cxx.cpp b/ttyd-tools/rel/source/cxx.cpp
@@ -18,3 +18,11 @@ void operator delete[](void *ptr)
 {
 	return ttyd::memory::__memFree(0, ptr);
 }
+void operator delete(void *ptr, std::size_t size)
+{
+	return ttyd::memory::__memFree(0, ptr);
+}
+void operator delete[](void *ptr, std::size_t size)
+{
+	return ttyd::memory::__memFree(0, ptr);
+}
diff --git a/ttyd-tools/rel/source/draw.cpp b/ttyd-tools/rel/source/draw.cpp
@@ -3421,10 +3421,10 @@ void drawWarpByEventMenuDetails()
 		String = "No";
 	}
 	
-	int32_t tempPosX = PosX + 232;
+	int32_t tempPosX = PosX + 147;
 	
 	#ifdef TTYD_JP
-	tempPosX -= 10;
+	tempPosX -= 4;
 	#endif
 	
 	drawText(String, tempPosX, PosY, Alpha, Color, Scale);
diff --git a/ttyd-tools/rel/source/global.cpp b/ttyd-tools/rel/source/global.cpp
@@ -3,7 +3,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.38";
+const char *VersionNumber = "v3.0.39";
 
 const char *RootLines[] = 
 {
@@ -1589,7 +1589,7 @@ const char *WarpDescriptions[] =
 const char *WarpEventLines[] = 
 {
 	"Select Event",
-	"Keep Standard Inventory",
+	"Keep Inventory",
 	"Set Flags",
 	"Warp",
 };
diff --git a/ttyd-tools/rel/source/menufunctions.cpp b/ttyd-tools/rel/source/menufunctions.cpp
@@ -2225,7 +2225,7 @@ void setMarioStatsValue(uint32_t currentMenuOption)
 		{
 			// Reset the value for entering battles
 			int16_t MaxFP = *reinterpret_cast<int16_t *>(PouchPtr + 0x76);
-			*reinterpret_cast<int16_t *>(PouchPtr + 0x76 + 0x1A) = MaxFP;	
+			*reinterpret_cast<int16_t *>(PouchPtr + 0x76 + 0x1A) = MaxFP;
 			
 			// Prevent the current value from exceeding the max value
 			int16_t CurrentFP = *reinterpret_cast<int16_t *>(PouchPtr + 0x74);
@@ -3449,17 +3449,29 @@ void *initStageEvents()
 		return ttyd::mariost::globalWorkPointer;
 	}
 	
-	// Back up the standard inventory if desired
-	int16_t StandardInventory[20];
-	void *StandardInventoryStartPtr = nullptr;
+	// Back up the inventory if desired
+	WarpByEventInventoryStruct *WarpByEventInventory = nullptr;
+	int16_t *StandardInventoryStart = nullptr;
+	int16_t *BadgesInventoryStart = nullptr;
 	
 	bool ShouldKeepInventory = WarpByEvent.ShouldKeepInventory;
 	if (ShouldKeepInventory)
 	{
-		StandardInventoryStartPtr = reinterpret_cast<void *>(
-			reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr()) + 0x192);
+		WarpByEventInventory = new WarpByEventInventoryStruct;
 		
-		memcpy(StandardInventory, StandardInventoryStartPtr, sizeof(StandardInventory));
+		uint32_t PouchPtrRaw = reinterpret_cast<uint32_t>(ttyd::mario_pouch::pouchGetPtr());
+		StandardInventoryStart = reinterpret_cast<int16_t *>(PouchPtrRaw + 0x192);
+		BadgesInventoryStart = reinterpret_cast<int16_t *>(PouchPtrRaw + 0x1FA);
+		
+		// Back up the standard inventory
+		memcpy(WarpByEventInventory->StandardItems, 
+			StandardInventoryStart, 
+			sizeof(WarpByEventInventory->StandardItems));
+		
+		// Back up the badges
+		memcpy(WarpByEventInventory->Badges, 
+			BadgesInventoryStart, 
+			sizeof(WarpByEventInventory->Badges));
 	}
 	
 	// Clear all current states
@@ -3484,16 +3496,84 @@ void *initStageEvents()
 	// Restore the standard inventory if desired
 	if (ShouldKeepInventory)
 	{
-		memcpy(StandardInventoryStartPtr, StandardInventory, sizeof(StandardInventory));
+		auto addItemToInventory = [](int16_t *inventoryStart, uint32_t totalSlots, int16_t item)
+		{
+			for (uint32_t i = 0; i < totalSlots; i++)
+			{
+				if (inventoryStart[i] == 0)
+				{
+					inventoryStart[i] = item;
+					break;
+				}
+			}
+		};
+		
+		// Restore the standard inventory
+		memcpy(StandardInventoryStart, 
+			WarpByEventInventory->StandardItems, 
+			sizeof(WarpByEventInventory->StandardItems));
+		
+		// Restore the badges
+		memcpy(BadgesInventoryStart, 
+			WarpByEventInventory->Badges, 
+			sizeof(WarpByEventInventory->Badges));
+		
+		delete WarpByEventInventory;
+		
+		// Add any items or badges that the player should have gotten
+		
+		/* If the player warped to an event that is 58 or higher, then they should be given 
+			Attack FX R, Power Bounce, Multibounce, and Power Smash. Attack FX R should also
+			be equipped if going to fight Hooktail.*/
+		if (CurrentIndex >= 58)
+		{
+			// Set up the badges to give
+			static const int16_t BadgesToGive[] = 
+			{
+				ttyd::item_data::Item::AttackFXR,
+				ttyd::item_data::Item::PowerBounce,
+				ttyd::item_data::Item::Multibounce,
+				ttyd::item_data::Item::PowerSmash,
+			};
+			
+			// Give the badges
+			// Only give the badges if the player does not have them already
+			uint32_t Size = sizeof(BadgesToGive) / sizeof(BadgesToGive[0]);
+			for (uint32_t i = 0; i < Size; i++)
+			{
+				int16_t CurrentBadge = BadgesToGive[i];
+				if (!checkIfHaveItem(CurrentBadge))
+				{
+					addItemToInventory(BadgesInventoryStart, 200, CurrentBadge);
+				}
+			}
+			
+			// Unequip Attack FX R if it's equipped, as the new badge order may cause it to break
+			ttyd::mario_pouch::pouchUnEquipBadgeID(ttyd::item_data::Item::AttackFXR);
+			
+			// Re-equip Attack FX R if currently going to fight Hooktail
+			if (CurrentIndex == 58)
+			{
+				ttyd::mario_pouch::pouchEquipBadgeID(ttyd::item_data::Item::AttackFXR);
+			}
+		}
 		
 		/* 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);
-		}
+			// Only give the Coconut if the player doesn't have one already
+			if (!checkIfHaveItem(ttyd::item_data::Item::Coconut))
+			{
+				uint32_t TotalSlots = 10;
+				if (checkIfHaveItem(ttyd::item_data::Item::StrangeSack))
+				{
+					TotalSlots = 20;
+				}
+				
+				addItemToInventory(StandardInventoryStart, TotalSlots, ttyd::item_data::Item::Coconut);
+			}
+		};
 	}
 	
 	// Set specific flags if desired
@@ -3569,7 +3649,7 @@ void *initStageEvents()
 	}
 	
 	// Perform a full recovery for Mario and the partners
-	ttyd::mario_pouch::pouchReviseMarioParam(); // May not necessary to call, as other init functions call it
+	ttyd::mario_pouch::pouchReviseMarioParam();
 	ttyd::evt_pouch::evt_pouch_mario_recovery();
 	
 	/* Must call pouchRevisePartyParam to properly set each partner's stats, 

Original file line number	Diff line number	Diff line change
`@@ -703,6 +703,12 @@ struct WarpByEventStruct`
`703`	`703`	`}`
`704`	`704`	`};`
`705`	`705`
	`706`	`+struct WarpByEventInventoryStruct`
	`707`	`+{`
	`708`	`+ int16_t StandardItems[20];`
	`709`	`+ int16_t Badges[200];`
	`710`	`+};`
	`711`	`+`
`706`	`712`	`struct WarpByEventDetailsStruct`
`707`	`713`	`{`
`708`	`714`	`#ifdef TTYD_JP`
Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,11 @@ bool checkIfBadgeEquipped(int16_t badge)`
`263`	`263`	`return ttyd::mario_pouch::pouchEquipCheckBadge(badge) > 0;`
`264`	`264`	`}`
`265`	`265`
	`266`	`+bool checkIfHaveItem(int16_t item)`
	`267`	`+{`
	`268`	`+ return ttyd::mario_pouch::pouchCheckItem(item) > 0;`
	`269`	`+}`
	`270`	`+`
`266`	`271`	`void recheckJumpAndHammerLevels()`
`267`	`272`	`{`
`268`	`273`	`ttyd::mario_pouch::pouchGetJumpLv();`
Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,11 @@ void operator delete[](void *ptr)`
`18`	`18`	`{`
`19`	`19`	`return ttyd::memory::__memFree(0, ptr);`
`20`	`20`	`}`
	`21`	`+void operator delete(void *ptr, std::size_t size)`
	`22`	`+{`
	`23`	`+ return ttyd::memory::__memFree(0, ptr);`
	`24`	`+}`
	`25`	`+void operator delete[](void *ptr, std::size_t size)`
	`26`	`+{`
	`27`	`+ return ttyd::memory::__memFree(0, ptr);`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace mod {`
`5`	`5`
`6`		`-const char *VersionNumber = "v3.0.38";`
	`6`	`+const char *VersionNumber = "v3.0.39";`
`7`	`7`
`8`	`8`	`const char *RootLines[] =`
`9`	`9`	`{`
`@@ -1589,7 +1589,7 @@ const char *WarpDescriptions[] =`
`1589`	`1589`	`const char *WarpEventLines[] =`
`1590`	`1590`	`{`
`1591`	`1591`	`"Select Event",`
`1592`		`- "Keep Standard Inventory",`
	`1592`	`+ "Keep Inventory",`
`1593`	`1593`	`"Set Flags",`
`1594`	`1594`	`"Warp",`
`1595`	`1595`	`};`