Document friendship events, primary status ailments, and misc cleanup

1 files changed, 6 insertions, 5 deletions

diff --git a/src/choose_party.c b/src/choose_party.c
index b4920dedd..186b42de3 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -671,15 +671,16 @@ static void sub_8122B10(u8 taskId)
     {
         if (gMultiPartnerParty[i].species != 0)
         {
-            u8 r2;
+            u8 primaryStatus;
 
             PartyMenuDoPrintHP(i + 3, 3, gMultiPartnerParty[i].hp, gMultiPartnerParty[i].maxhp);
             if (gMultiPartnerParty[i].hp == 0)
-                r2 = 7;
+                primaryStatus = 7;
             else
-                r2 = pokemon_ailments_get_primary(gMultiPartnerParty[i].status);
-            if (r2 != 0)
-                PartyMenuPutStatusTilemap(i + 3, 3, r2 - 1);
+                primaryStatus = GetPrimaryStatus(gMultiPartnerParty[i].status);
+
+            if (primaryStatus != STATUS_PRIMARY_NONE)
+                PartyMenuPutStatusTilemap(i + 3, 3, primaryStatus - 1);
             else
                 PartyMenuDoPrintLevel(i + 3, 3, gMultiPartnerParty[i].level);
             PartyMenuDoPrintGenderIcon(gMultiPartnerParty[i].species, gMultiPartnerParty[i].gender, 3, i + 3, gMultiPartnerParty[i].nickname);