diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/pokemon_size_record.c | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/pokemon_size_record.c')
| -rw-r--r-- | src/pokemon_size_record.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 473bbee03..2d9a2f08f 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -206,13 +206,13 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId) if (index < 11 && ribbonId < 65) { gSaveBlock1Ptr->giftRibbons[index] = ribbonId; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { - struct Pokemon *pkmn = &gPlayerParty[i]; + struct Pokemon *mon = &gPlayerParty[i]; - if (GetMonData(pkmn, MON_DATA_SPECIES) != 0 && GetMonData(pkmn, MON_DATA_SANITY_BIT3) == 0) + if (GetMonData(mon, MON_DATA_SPECIES) != 0 && GetMonData(mon, MON_DATA_SANITY_BIT3) == 0) { - SetMonData(pkmn, array[index], &data); + SetMonData(mon, array[index], &data); gotRibbon = TRUE; } } |