Adjusted several uses of party functions

Changed the parameter for partyGetPtr to an int32_t.

Removed conditional checks in getPartnerPointer, getFollowerPointer, removePartnerFromOverworld, and removeFollowerFromOverworld. This is because the functions that they call, partyGetPtr and partyKill2, already do the same conditional checks.

Removed a conditional check in menufunctions.cpp before calling removeFollowerFromOverworld, for the same reason listed above.

Used the proper variable type for partyEntry2Hello in menufunctions.cpp.

Author: Zephiles

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

@@ -90,7 +90,7 @@ int32_t partyKill2(int32_t partyId);
 // partyPaperOff
 // partyPaperOn
 // anotherPartyGetPtr
-void *partyGetPtr(uint32_t partyId);
+void *partyGetPtr(int32_t partyId);
 
 }
 

ttyd-tools/rel/source/commonfunctions.cpp

@@ -224,41 +224,25 @@ int32_t getFollowerID()
 void *getPartnerPointer()
 {
 	int32_t PartyID = getPartnerID();
-	if (PartyID < 0)
-	{
-		return nullptr;
-	}
-	
 	return ttyd::party::partyGetPtr(PartyID);
 }
 
 void *getFollowerPointer()
 {
-	int32_t PartyID = getFollowerID();
-	if (PartyID < 0)
-	{
-		return nullptr;
-	}
-	
-	return ttyd::party::partyGetPtr(PartyID);
+	int32_t FollowerID = getFollowerID();
+	return ttyd::party::partyGetPtr(FollowerID);
 }
 
 void removePartnerFromOverworld()
 {
 	int32_t PartyID = getPartnerID();
-	if (PartyID >= 0)
-	{
-		ttyd::party::partyKill2(PartyID);
-	}
+	ttyd::party::partyKill2(PartyID);
 }
 
 void removeFollowerFromOverworld()
 {
-	int32_t PartyID = getFollowerID();
-	if (PartyID >= 0)
-	{
-		ttyd::party::partyKill2(PartyID);
-	}
+	int32_t FollowerID = getFollowerID();
+	ttyd::party::partyKill2(FollowerID);
 }
 
 bool checkIfBadgeEquipped(int16_t badge)

ttyd-tools/rel/source/menufunctions.cpp

@@ -1652,17 +1652,13 @@ uint32_t followersOptionsButtonControls()
 		{
 			if (checkIfInGame())
 			{
-				int32_t FollowerId = getFollowerID();
-				if (FollowerId >= 0)
-				{
-					// A follower is currently out, so remove it
-					removeFollowerFromOverworld();
-				}
+				// If a follower is out, remove them
+				removeFollowerFromOverworld();
 
-				// Spawn the new follower
-				uint32_t NewFollower = SecondaryMenuOption + 8; // Start at the egg
+				// Get the new follower
+				uint8_t NewFollower = SecondaryMenuOption + 8; // Start at the egg
 
-				// Spawn the follower
+				// Spawn the new follower
 				int32_t ReturnCode = ttyd::party::partyEntry2Hello(
 					static_cast<ttyd::party::PartyMembers>(NewFollower));