Use marioPartyEntry when spawning followers

Zephiles · Zephiles · commit e7993a28703c · 2019-10-23T04:41:13.000-05:00
This also requires partyRun to be called to make sure that the follower is moving. Partners will be moving by default, and partyRun only makes partners/followers run if they're not already moving, so calling partyRun when spawning a partner will not cause issues.
diff --git a/ttyd-tools/rel/Makefile b/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,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
+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,marioGetPtr -Wl,--wrap,partyGetPtr -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)
 
diff --git a/ttyd-tools/rel/include/commonfunctions.h b/ttyd-tools/rel/include/commonfunctions.h
@@ -37,7 +37,7 @@ void removePartnerFromOverworld();
 void removeFollowerFromOverworld();
 uint32_t getCurrentYoshiColorId();
 void setNewYoshiColorId(uint32_t colorId);
-void spawnFollower(ttyd::party::PartyMembers followerId);
+void spawnPartnerOrFollower(ttyd::party::PartyMembers partyId);
 bool checkIfBadgeEquipped(int16_t badge);
 bool checkIfHaveItem(int16_t item);
 void recheckJumpAndHammerLevels();
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -905,7 +905,7 @@
 // 800BF954:partyEntryHello
 // 800BF9A4:partySetForceMove
 // 800BF9EC:partyStop
-// 800BFA10:partyRun
+800BFA10:partyRun
 // 800BFA40:partyCtrlOn
 // 800BFA78:partyCtrlOff
 // 800BFAB0:partyChgPaper
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -903,7 +903,7 @@
 // 800BC89C:partyEntryHello
 // 800BC8EC:partySetForceMove
 // 800BC934:partyStop
-// 800BC958:partyRun
+800BC958:partyRun
 // 800BC988:partyCtrlOn
 // 800BC9C0:partyCtrlOff
 // 800BC9F8:partyChgPaper
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -903,7 +903,7 @@
 // 800BEC20:partyEntryHello
 // 800BEC70:partySetForceMove
 // 800BECB8:partyStop
-// 800BECDC:partyRun
+800BECDC:partyRun
 // 800BED0C:partyCtrlOn
 // 800BED44:partyCtrlOff
 // 800BED7C:partyChgPaper
diff --git a/ttyd-tools/rel/include/ttyd/party.h b/ttyd-tools/rel/include/ttyd/party.h
@@ -81,7 +81,7 @@ int32_t partyKill2(int32_t partyId);
 // partyEntryHello
 // partySetForceMove
 // partyStop
-// partyRun
+void partyRun(void *partyPtr);
 // partyCtrlOn
 // partyCtrlOff
 // partyChgPaper
diff --git a/ttyd-tools/rel/source/commonfunctions.cpp b/ttyd-tools/rel/source/commonfunctions.cpp
@@ -241,21 +241,19 @@ void setNewYoshiColorId(uint32_t colorId)
 	ttyd::mario_pouch::pouchSetPartyColor(YoshiPartnerId, colorId);
 }
 
-void spawnFollower(ttyd::party::PartyMembers followerId)
+void spawnPartnerOrFollower(ttyd::party::PartyMembers partyId)
 {
-	// If a follower is out, remove them
-	removeFollowerFromOverworld();
+	// Spawn the partner/follower
+	int32_t PartySlotId = ttyd::mario_party::marioPartyEntry(partyId);
 	
-	// Spawn the new follower
-	int32_t ReturnCode = ttyd::party::partyEntry2Hello(followerId);
-	
-	// Set specific bytes
-	if (ReturnCode >= 0)
+	// Make sure the partner/follower spawned properly
+	if (PartySlotId < 0)
 	{
-		ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-		player->wFollowerFlags[1] = static_cast<uint8_t>(ReturnCode);
-		player->prevFollowerId[1] = followerId;
+		return;
 	}
+	
+	// Make sure the partner/follower is moving
+	ttyd::party::partyRun(ttyd::party::partyGetPtr(PartySlotId));
 }
 
 bool checkIfBadgeEquipped(int16_t badge)
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.39";
+const char *VersionNumber = "v3.0.40";
 
 const char *RootLines[] = 
 {
diff --git a/ttyd-tools/rel/source/main.cpp b/ttyd-tools/rel/source/main.cpp
@@ -171,12 +171,12 @@ void *fixEvtMapBlendSetFlagPartnerCrash(void *partnerPtr)
 		if (PreviousPartnerOut != ttyd::party::PartyMembers::kNone)
 		{
 			// A partner was previously out, so bring them back out
-			ttyd::mario_party::marioPartyHello(PreviousPartnerOut);
+			spawnPartnerOrFollower(PreviousPartnerOut);
 		}
 		else
 		{
 			// No partner was previously out, so bring out Goombella
-			ttyd::mario_party::marioPartyHello(ttyd::party::PartyMembers::kGoombella);
+			spawnPartnerOrFollower(ttyd::party::PartyMembers::kGoombella);
 		}
 		
 		return getPartnerPointer();
@@ -199,12 +199,12 @@ void *fixEvtMapBlendSetFlagFollowerCrash(void *followerPtr)
 		if (PreviousFollowerOut != ttyd::party::PartyMembers::kNone)
 		{
 			// A follower was previously out, so bring them back out
-			spawnFollower(PreviousFollowerOut);
+			spawnPartnerOrFollower(PreviousFollowerOut);
 		}
 		else
 		{
 			// No follower was previously out, so bring out Gus
-			spawnFollower(ttyd::party::PartyMembers::kGus);
+			spawnPartnerOrFollower(ttyd::party::PartyMembers::kGus);
 		}
 		
 		return getFollowerPointer();
diff --git a/ttyd-tools/rel/source/menufunctions.cpp b/ttyd-tools/rel/source/menufunctions.cpp
@@ -228,7 +228,7 @@ void partnerMenuRemoveOrBringOut(void *partnerEnabledAddress)
 				PartnerEnabledAddress + 1) = true;
 			
 			// Bring the partner out
-			ttyd::mario_party::marioPartyEntry(getSelectedOptionPartnerValue());
+			spawnPartnerOrFollower(getSelectedOptionPartnerValue());
 			
 			// Restore the value of the enabled bool
 			*reinterpret_cast<bool *>(
@@ -1797,10 +1797,10 @@ uint32_t followersOptionsButtonControls()
 			}
 			
 			// Get the follower id to use
-			uint8_t NewFollower = MenuVar.SecondaryMenuOption + 8; // Start at the egg
+			uint32_t NewFollower = MenuVar.SecondaryMenuOption + 8; // Start at the egg
 			
 			// Spawn the new follower
-			spawnFollower(static_cast<ttyd::party::PartyMembers>(NewFollower));
+			spawnPartnerOrFollower(static_cast<ttyd::party::PartyMembers>(NewFollower));
 			
 			closeSecondaryMenu();
 			
@@ -3638,14 +3638,14 @@ void *initStageEvents()
 	ttyd::party::PartyMembers PartnerId = TargetEvent->partyId[0];
 	if (PartnerId != ttyd::party::PartyMembers::kNone)
 	{
-		ttyd::mario_party::marioPartyEntry(PartnerId);
+		spawnPartnerOrFollower(PartnerId);
 	}
 	
 	// Spawn the follower for the current event
 	ttyd::party::PartyMembers FollowerId = TargetEvent->partyId[1];
 	if (FollowerId != ttyd::party::PartyMembers::kNone)
 	{
-		ttyd::mario_party::marioPartyEntry(FollowerId);
+		spawnPartnerOrFollower(FollowerId);
 	}
 	
 	// Perform a full recovery for Mario and the partners
diff --git a/ttyd-tools/rel/source/wrappers.cpp b/ttyd-tools/rel/source/wrappers.cpp
@@ -34,8 +34,8 @@ extern "C"
 	void __real_marioStSystemLevel(uint32_t level);
 	int32_t __real_marioGetPartyId();
 	int32_t __real_marioGetExtraPartyId();
-	void __real_marioPartyEntry(ttyd::party::PartyMembers id);
 	ttyd::mario::Player *__real_marioGetPtr();
+	void *__real_partyGetPtr(int32_t partyId);
 	void *__real_pouchGetPtr();
 	void __real_btlGetScreenPoint(float pos[3], float posOut[3]);
 	ttyd::evtmgr::EvtWork *__real_evtGetWork();
@@ -186,18 +186,18 @@ extern "C"
 		return __real_marioGetExtraPartyId();
 	}
 	
-	// marioPartyEntry
-	void __wrap_marioPartyEntry(ttyd::party::PartyMembers id)
-	{
-		__real_marioPartyEntry(id);
-	}
-	
 	// marioGetPtr
 	__attribute__((noinline)) ttyd::mario::Player *__wrap_marioGetPtr()
 	{
 		return __real_marioGetPtr();
 	}
 	
+	// partyGetPtr
+	__attribute__((noinline)) void *__wrap_partyGetPtr(int32_t partyId)
+	{
+		return __real_partyGetPtr(partyId);
+	}
+	
 	// pouchGetPtr
 	__attribute__((noinline)) void *__wrap_pouchGetPtr()
 	{

Original file line number	Diff line number	Diff line change
`@@ -241,21 +241,19 @@ void setNewYoshiColorId(uint32_t colorId)`
`241`	`241`	`ttyd::mario_pouch::pouchSetPartyColor(YoshiPartnerId, colorId);`
`242`	`242`	`}`
`243`	`243`
`244`		`-void spawnFollower(ttyd::party::PartyMembers followerId)`
	`244`	`+void spawnPartnerOrFollower(ttyd::party::PartyMembers partyId)`
`245`	`245`	`{`
`246`		`- // If a follower is out, remove them`
`247`		`- removeFollowerFromOverworld();`
	`246`	`+ // Spawn the partner/follower`
	`247`	`+ int32_t PartySlotId = ttyd::mario_party::marioPartyEntry(partyId);`
`248`	`248`
`249`		`- // Spawn the new follower`
`250`		`- int32_t ReturnCode = ttyd::party::partyEntry2Hello(followerId);`
`251`		`-`
`252`		`- // Set specific bytes`
`253`		`- if (ReturnCode >= 0)`
	`249`	`+ // Make sure the partner/follower spawned properly`
	`250`	`+ if (PartySlotId < 0)`
`254`	`251`	`{`
`255`		`- ttyd::mario::Player *player = ttyd::mario::marioGetPtr();`
`256`		`- player->wFollowerFlags[1] = static_cast<uint8_t>(ReturnCode);`
`257`		`- player->prevFollowerId[1] = followerId;`
	`252`	`+ return;`
`258`	`253`	`}`
	`254`	`+`
	`255`	`+ // Make sure the partner/follower is moving`
	`256`	`+ ttyd::party::partyRun(ttyd::party::partyGetPtr(PartySlotId));`
`259`	`257`	`}`
`260`	`258`
`261`	`259`	`bool checkIfBadgeEquipped(int16_t badge)`
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.39";`
	`6`	`+const char *VersionNumber = "v3.0.40";`
`7`	`7`
`8`	`8`	`const char *RootLines[] =`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -171,12 +171,12 @@ void fixEvtMapBlendSetFlagPartnerCrash(void partnerPtr)`
`171`	`171`	`if (PreviousPartnerOut != ttyd::party::PartyMembers::kNone)`
`172`	`172`	`{`
`173`	`173`	`// A partner was previously out, so bring them back out`
`174`		`- ttyd::mario_party::marioPartyHello(PreviousPartnerOut);`
	`174`	`+ spawnPartnerOrFollower(PreviousPartnerOut);`
`175`	`175`	`}`
`176`	`176`	`else`
`177`	`177`	`{`
`178`	`178`	`// No partner was previously out, so bring out Goombella`
`179`		`- ttyd::mario_party::marioPartyHello(ttyd::party::PartyMembers::kGoombella);`
	`179`	`+ spawnPartnerOrFollower(ttyd::party::PartyMembers::kGoombella);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`return getPartnerPointer();`
`@@ -199,12 +199,12 @@ void fixEvtMapBlendSetFlagFollowerCrash(void followerPtr)`
`199`	`199`	`if (PreviousFollowerOut != ttyd::party::PartyMembers::kNone)`
`200`	`200`	`{`
`201`	`201`	`// A follower was previously out, so bring them back out`
`202`		`- spawnFollower(PreviousFollowerOut);`
	`202`	`+ spawnPartnerOrFollower(PreviousFollowerOut);`
`203`	`203`	`}`
`204`	`204`	`else`
`205`	`205`	`{`
`206`	`206`	`// No follower was previously out, so bring out Gus`
`207`		`- spawnFollower(ttyd::party::PartyMembers::kGus);`
	`207`	`+ spawnPartnerOrFollower(ttyd::party::PartyMembers::kGus);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`return getFollowerPointer();`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ void partnerMenuRemoveOrBringOut(void *partnerEnabledAddress)`
`228`	`228`	`PartnerEnabledAddress + 1) = true;`
`229`	`229`
`230`	`230`	`// Bring the partner out`
`231`		`- ttyd::mario_party::marioPartyEntry(getSelectedOptionPartnerValue());`
	`231`	`+ spawnPartnerOrFollower(getSelectedOptionPartnerValue());`
`232`	`232`
`233`	`233`	`// Restore the value of the enabled bool`
`234`	`234`	`reinterpret_cast<bool >(`
`@@ -1797,10 +1797,10 @@ uint32_t followersOptionsButtonControls()`
`1797`	`1797`	`}`
`1798`	`1798`
`1799`	`1799`	`// Get the follower id to use`
`1800`		`- uint8_t NewFollower = MenuVar.SecondaryMenuOption + 8; // Start at the egg`
	`1800`	`+ uint32_t NewFollower = MenuVar.SecondaryMenuOption + 8; // Start at the egg`
`1801`	`1801`
`1802`	`1802`	`// Spawn the new follower`
`1803`		`- spawnFollower(static_cast<ttyd::party::PartyMembers>(NewFollower));`
	`1803`	`+ spawnPartnerOrFollower(static_cast<ttyd::party::PartyMembers>(NewFollower));`
`1804`	`1804`
`1805`	`1805`	`closeSecondaryMenu();`
`1806`	`1806`
`@@ -3638,14 +3638,14 @@ void *initStageEvents()`
`3638`	`3638`	`ttyd::party::PartyMembers PartnerId = TargetEvent->partyId[0];`
`3639`	`3639`	`if (PartnerId != ttyd::party::PartyMembers::kNone)`
`3640`	`3640`	`{`
`3641`		`- ttyd::mario_party::marioPartyEntry(PartnerId);`
	`3641`	`+ spawnPartnerOrFollower(PartnerId);`
`3642`	`3642`	`}`
`3643`	`3643`
`3644`	`3644`	`// Spawn the follower for the current event`
`3645`	`3645`	`ttyd::party::PartyMembers FollowerId = TargetEvent->partyId[1];`
`3646`	`3646`	`if (FollowerId != ttyd::party::PartyMembers::kNone)`
`3647`	`3647`	`{`
`3648`		`- ttyd::mario_party::marioPartyEntry(FollowerId);`
	`3648`	`+ spawnPartnerOrFollower(FollowerId);`
`3649`	`3649`	`}`
`3650`	`3650`
`3651`	`3651`	`// Perform a full recovery for Mario and the partners`