Implemented an enum class for the slot ids for partners and followers

Zephiles · Zephiles · commit 07482081c15f · 2019-10-23T05:06:22.000-05:00
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 spawnPartnerOrFollower(ttyd::party::PartyMembers partyId);
+void spawnPartnerOrFollower(ttyd::party::PartyMembers id);
 bool checkIfBadgeEquipped(int16_t badge);
 bool checkIfHaveItem(int16_t item);
 void recheckJumpAndHammerLevels();
diff --git a/ttyd-tools/rel/include/menufunctions.h b/ttyd-tools/rel/include/menufunctions.h
@@ -74,7 +74,7 @@ void cheatClearAreaFlags(uint32_t currentMenuOption);
 const char *getMapFromIndex(int32_t index);
 int32_t getMapIndex();
 
-const char *getPartyName(ttyd::party::PartyMembers partyId);
+const char *getPartyName(ttyd::party::PartyMembers id);
 int32_t getTotalStageEvents();
 bool indexToStageAndEvent(int32_t index, int32_t arrayOut[2]);
 bool checkForValidStageAndEvent(int32_t stageId, int32_t eventId);
diff --git a/ttyd-tools/rel/include/ttyd/mario_party.h b/ttyd-tools/rel/include/ttyd/mario_party.h
@@ -13,13 +13,13 @@ extern "C" {
 // partyChkJoin
 void partyLeft(ttyd::party::PartyMembers id);
 void partyJoin(ttyd::party::PartyMembers id);
-int32_t marioGetExtraPartyId();
-int32_t marioGetPartyId();
+ttyd::party::PartySlotId marioGetExtraPartyId();
+ttyd::party::PartySlotId marioGetPartyId();
 // marioGetParty
 void marioPartyKill();
 int32_t marioPartyGoodbye();
-int32_t marioPartyHello(ttyd::party::PartyMembers id);
-int32_t marioPartyEntry(ttyd::party::PartyMembers id);
+ttyd::party::PartySlotId marioPartyHello(ttyd::party::PartyMembers id);
+ttyd::party::PartySlotId marioPartyEntry(ttyd::party::PartyMembers id);
 // marioUseParty
 
 }
diff --git a/ttyd-tools/rel/include/ttyd/party.h b/ttyd-tools/rel/include/ttyd/party.h
@@ -4,6 +4,13 @@
 
 namespace ttyd::party {
 
+enum class PartySlotId : int32_t
+{
+	kNone = -1,
+	kParty,
+	kFollower,
+};
+
 enum class PartyMembers : uint8_t
 {
 	kNone = 0,
@@ -68,12 +75,12 @@ extern "C" {
 // partyReInit
 // partyInit
 // partyEntry2Pos
-int32_t partyEntry2Hello(PartyMembers id);
+PartySlotId partyEntry2Hello(PartyMembers id);
 // partyEntry2
 // partyEntryMain
 // partyGetHeight
 // yoshiSetColor
-int32_t partyKill2(int32_t partyId);
+int32_t partyKill2(PartySlotId id);
 // partyKill
 // partyGoodbye
 // partyEntryPos
@@ -91,7 +98,7 @@ void partyRun(void *partyPtr);
 // partyPaperOff
 // partyPaperOn
 // anotherPartyGetPtr
-void *partyGetPtr(int32_t partyId);
+void *partyGetPtr(PartySlotId id);
 
 }
 
diff --git a/ttyd-tools/rel/source/commonfunctions.cpp b/ttyd-tools/rel/source/commonfunctions.cpp
@@ -199,26 +199,26 @@ void *clearMemory(void *destination, std::size_t size)
 
 void *getPartnerPointer()
 {
-	int32_t PartyID = ttyd::mario_party::marioGetPartyId();
-	return ttyd::party::partyGetPtr(PartyID);
+	ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetPartyId();
+	return ttyd::party::partyGetPtr(Id);
 }
 
 void *getFollowerPointer()
 {
-	int32_t FollowerID = ttyd::mario_party::marioGetExtraPartyId();
-	return ttyd::party::partyGetPtr(FollowerID);
+	ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetExtraPartyId();
+	return ttyd::party::partyGetPtr(Id);
 }
 
 void removePartnerFromOverworld()
 {
-	int32_t PartyID = ttyd::mario_party::marioGetPartyId();
-	ttyd::party::partyKill2(PartyID);
+	ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetPartyId();
+	ttyd::party::partyKill2(Id);
 }
 
 void removeFollowerFromOverworld()
 {
-	int32_t FollowerID = ttyd::mario_party::marioGetExtraPartyId();
-	ttyd::party::partyKill2(FollowerID);
+	ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetExtraPartyId();
+	ttyd::party::partyKill2(Id);
 }
 
 uint32_t getCurrentYoshiColorId()
@@ -241,13 +241,13 @@ void setNewYoshiColorId(uint32_t colorId)
 	ttyd::mario_pouch::pouchSetPartyColor(YoshiPartnerId, colorId);
 }
 
-void spawnPartnerOrFollower(ttyd::party::PartyMembers partyId)
+void spawnPartnerOrFollower(ttyd::party::PartyMembers id)
 {
 	// Spawn the partner/follower
-	int32_t PartySlotId = ttyd::mario_party::marioPartyEntry(partyId);
+	ttyd::party::PartySlotId PartySlotId = ttyd::mario_party::marioPartyEntry(id);
 	
 	// Make sure the partner/follower spawned properly
-	if (PartySlotId < 0)
+	if (PartySlotId <= ttyd::party::PartySlotId::kNone)
 	{
 		return;
 	}
diff --git a/ttyd-tools/rel/source/menufunctions.cpp b/ttyd-tools/rel/source/menufunctions.cpp
@@ -3182,9 +3182,9 @@ int32_t getMapIndex()
 	return -1;
 }
 
-const char *getPartyName(ttyd::party::PartyMembers partyId)
+const char *getPartyName(ttyd::party::PartyMembers id)
 {
-	switch (partyId)
+	switch (id)
 	{
 		case ttyd::party::PartyMembers::kNone:
 		{
diff --git a/ttyd-tools/rel/source/wrappers.cpp b/ttyd-tools/rel/source/wrappers.cpp
@@ -32,10 +32,10 @@ extern "C"
 	void __real_swSet(uint32_t gswf);
 	uint32_t __real_marioStGetSystemLevel();
 	void __real_marioStSystemLevel(uint32_t level);
-	int32_t __real_marioGetPartyId();
-	int32_t __real_marioGetExtraPartyId();
+	ttyd::party::PartySlotId __real_marioGetPartyId();
+	ttyd::party::PartySlotId __real_marioGetExtraPartyId();
 	ttyd::mario::Player *__real_marioGetPtr();
-	void *__real_partyGetPtr(int32_t partyId);
+	void *__real_partyGetPtr(ttyd::party::PartySlotId partySlotId);
 	void *__real_pouchGetPtr();
 	void __real_btlGetScreenPoint(float pos[3], float posOut[3]);
 	ttyd::evtmgr::EvtWork *__real_evtGetWork();
@@ -175,13 +175,13 @@ extern "C"
 	}
 	
 	// marioGetPartyId
-	__attribute__((noinline)) int32_t __wrap_marioGetPartyId()
+	__attribute__((noinline)) ttyd::party::PartySlotId __wrap_marioGetPartyId()
 	{
 		return __real_marioGetPartyId();
 	}
 	
 	// marioGetExtraPartyId
-	__attribute__((noinline)) int32_t __wrap_marioGetExtraPartyId()
+	__attribute__((noinline)) ttyd::party::PartySlotId __wrap_marioGetExtraPartyId()
 	{
 		return __real_marioGetExtraPartyId();
 	}
@@ -193,9 +193,9 @@ extern "C"
 	}
 	
 	// partyGetPtr
-	__attribute__((noinline)) void *__wrap_partyGetPtr(int32_t partyId)
+	__attribute__((noinline)) void *__wrap_partyGetPtr(ttyd::party::PartySlotId partySlotId)
 	{
-		return __real_partyGetPtr(partyId);
+		return __real_partyGetPtr(partySlotId);
 	}
 	
 	// pouchGetPtr

Original file line number	Diff line number	Diff line change
`@@ -199,26 +199,26 @@ void clearMemory(void destination, std::size_t size)`
`199`	`199`
`200`	`200`	`void *getPartnerPointer()`
`201`	`201`	`{`
`202`		`- int32_t PartyID = ttyd::mario_party::marioGetPartyId();`
`203`		`- return ttyd::party::partyGetPtr(PartyID);`
	`202`	`+ ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetPartyId();`
	`203`	`+ return ttyd::party::partyGetPtr(Id);`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`void *getFollowerPointer()`
`207`	`207`	`{`
`208`		`- int32_t FollowerID = ttyd::mario_party::marioGetExtraPartyId();`
`209`		`- return ttyd::party::partyGetPtr(FollowerID);`
	`208`	`+ ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetExtraPartyId();`
	`209`	`+ return ttyd::party::partyGetPtr(Id);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`void removePartnerFromOverworld()`
`213`	`213`	`{`
`214`		`- int32_t PartyID = ttyd::mario_party::marioGetPartyId();`
`215`		`- ttyd::party::partyKill2(PartyID);`
	`214`	`+ ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetPartyId();`
	`215`	`+ ttyd::party::partyKill2(Id);`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`void removeFollowerFromOverworld()`
`219`	`219`	`{`
`220`		`- int32_t FollowerID = ttyd::mario_party::marioGetExtraPartyId();`
`221`		`- ttyd::party::partyKill2(FollowerID);`
	`220`	`+ ttyd::party::PartySlotId Id = ttyd::mario_party::marioGetExtraPartyId();`
	`221`	`+ ttyd::party::partyKill2(Id);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`uint32_t getCurrentYoshiColorId()`
`@@ -241,13 +241,13 @@ void setNewYoshiColorId(uint32_t colorId)`
`241`	`241`	`ttyd::mario_pouch::pouchSetPartyColor(YoshiPartnerId, colorId);`
`242`	`242`	`}`
`243`	`243`
`244`		`-void spawnPartnerOrFollower(ttyd::party::PartyMembers partyId)`
	`244`	`+void spawnPartnerOrFollower(ttyd::party::PartyMembers id)`
`245`	`245`	`{`
`246`	`246`	`// Spawn the partner/follower`
`247`		`- int32_t PartySlotId = ttyd::mario_party::marioPartyEntry(partyId);`
	`247`	`+ ttyd::party::PartySlotId PartySlotId = ttyd::mario_party::marioPartyEntry(id);`
`248`	`248`
`249`	`249`	`// Make sure the partner/follower spawned properly`
`250`		`- if (PartySlotId < 0)`
	`250`	`+ if (PartySlotId <= ttyd::party::PartySlotId::kNone)`
`251`	`251`	`{`
`252`	`252`	`return;`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3182,9 +3182,9 @@ int32_t getMapIndex()`
`3182`	`3182`	`return -1;`
`3183`	`3183`	`}`
`3184`	`3184`
`3185`		`-const char *getPartyName(ttyd::party::PartyMembers partyId)`
	`3185`	`+const char *getPartyName(ttyd::party::PartyMembers id)`
`3186`	`3186`	`{`
`3187`		`- switch (partyId)`
	`3187`	`+ switch (id)`
`3188`	`3188`	`{`
`3189`	`3189`	`case ttyd::party::PartyMembers::kNone:`
`3190`	`3190`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ extern "C"`
`32`	`32`	`void __real_swSet(uint32_t gswf);`
`33`	`33`	`uint32_t __real_marioStGetSystemLevel();`
`34`	`34`	`void __real_marioStSystemLevel(uint32_t level);`
`35`		`- int32_t __real_marioGetPartyId();`
`36`		`- int32_t __real_marioGetExtraPartyId();`
	`35`	`+ ttyd::party::PartySlotId __real_marioGetPartyId();`
	`36`	`+ ttyd::party::PartySlotId __real_marioGetExtraPartyId();`
`37`	`37`	`ttyd::mario::Player *__real_marioGetPtr();`
`38`		`- void *__real_partyGetPtr(int32_t partyId);`
	`38`	`+ void *__real_partyGetPtr(ttyd::party::PartySlotId partySlotId);`
`39`	`39`	`void *__real_pouchGetPtr();`
`40`	`40`	`void __real_btlGetScreenPoint(float pos[3], float posOut[3]);`
`41`	`41`	`ttyd::evtmgr::EvtWork *__real_evtGetWork();`
`@@ -175,13 +175,13 @@ extern "C"`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`// marioGetPartyId`
`178`		`- __attribute__((noinline)) int32_t __wrap_marioGetPartyId()`
	`178`	`+ __attribute__((noinline)) ttyd::party::PartySlotId __wrap_marioGetPartyId()`
`179`	`179`	`{`
`180`	`180`	`return __real_marioGetPartyId();`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`// marioGetExtraPartyId`
`184`		`- __attribute__((noinline)) int32_t __wrap_marioGetExtraPartyId()`
	`184`	`+ __attribute__((noinline)) ttyd::party::PartySlotId __wrap_marioGetExtraPartyId()`
`185`	`185`	`{`
`186`	`186`	`return __real_marioGetExtraPartyId();`
`187`	`187`	`}`
`@@ -193,9 +193,9 @@ extern "C"`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`// partyGetPtr`
`196`		`- __attribute__((noinline)) void *__wrap_partyGetPtr(int32_t partyId)`
	`196`	`+ __attribute__((noinline)) void *__wrap_partyGetPtr(ttyd::party::PartySlotId partySlotId)`
`197`	`197`	`{`
`198`		`- return __real_partyGetPtr(partyId);`
	`198`	`+ return __real_partyGetPtr(partySlotId);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`// pouchGetPtr`