Merge pull request #1679 from LOuroboros/ribbons

Untangled CheckPartnersMonForRibbons
This commit is contained in:
GriffinR 2022-06-09 14:47:38 -04:00 committed by GitHub
commit 6418f08944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4813,7 +4813,7 @@ static void CheckPartnersMonForRibbons(void)
{ {
u8 i; u8 i;
u8 numRibbons = 0; u8 numRibbons = 0;
for (i = 0; i < 12; i ++) for (i = 0; i < (MON_DATA_UNUSED_RIBBONS - MON_DATA_CHAMPION_RIBBON); i ++)
{ {
numRibbons += GetMonData(&gEnemyParty[gSelectedTradeMonPositions[TRADE_PARTNER] % PARTY_SIZE], MON_DATA_CHAMPION_RIBBON + i); numRibbons += GetMonData(&gEnemyParty[gSelectedTradeMonPositions[TRADE_PARTNER] % PARTY_SIZE], MON_DATA_CHAMPION_RIBBON + i);
} }