summaryrefslogtreecommitdiff
path: root/src/field/field_control_avatar.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-29 21:50:48 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-29 21:50:48 -0500
commit46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (patch)
tree928ec5581c3a77d459fe13a2ef278693e517f400 /src/field/field_control_avatar.c
parente7c94a3c270a2a43a3a84e7cefe98d9044d93dd6 (diff)
parent1416a4c4efe8b926c809664eb63dd2c3d0f86728 (diff)
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/field/field_control_avatar.c')
-rw-r--r--src/field/field_control_avatar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index bf96c724f..83924b384 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -532,7 +532,7 @@ static void happiness_algorithm_step(void)
{
struct Pokemon *pkmn = gPlayerParty;
- for (i = 5; i >= 0; i--)
+ for (i = 0; i < 6; i++)
{
AdjustFriendship(pkmn, 5);
pkmn++;