Merge pull request #591 from huderlem/misc_doc

Document friendship events, primary status ailments, and misc cleanup

1 files changed, 4 insertions, 5 deletions

diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 3ae422512..918ab0e21 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -587,12 +587,11 @@ static void happiness_algorithm_step(void)
     (*ptr) %= 128;
     if (*ptr == 0)
     {
-        struct Pokemon *pkmn = gPlayerParty;
-
-        for (i = 0; i < 6; i++)
+        struct Pokemon *mon = gPlayerParty;
+        for (i = 0; i < PARTY_SIZE; i++)
         {
-            AdjustFriendship(pkmn, 5);
-            pkmn++;
+            AdjustFriendship(mon, FRIENDSHIP_EVENT_WALKING);
+            mon++;
         }
     }
 }