diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-09 20:06:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-09 20:06:14 -0400 |
| commit | 45a2675c9de2644b546e59240d8482a7dfc5c9d7 (patch) | |
| tree | 8c045e88ce39b04e132ad055c6bdcda6aac7e490 /src/field_control_avatar.c | |
| parent | 4987b746365ec09af10bc2a1ce11dbffaa284b50 (diff) | |
| parent | 1f60ac0f857da06bd8a678f7150c42cc94940f3f (diff) | |
Merge branch 'master' into nohara
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 9 |
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++; } } } |