diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
| commit | 204d3e45f0c0843ada1243897d36e873059efde1 (patch) | |
| tree | b4c3fae28387695175f007357848286afbb0a494 /src/field/field_control_avatar.c | |
| parent | 3ed97d94be70bee91b581517311c01cf20c917de (diff) | |
| parent | f1584e69c307427516d2c180ab92e28bc3786326 (diff) | |
Merge remote-tracking branch 'origin/master' into battle-1
Diffstat (limited to 'src/field/field_control_avatar.c')
| -rw-r--r-- | src/field/field_control_avatar.c | 2 |
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++; |