diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-18 13:36:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 13:36:34 -0600 |
| commit | 963989d760a09eab46607efe1cbc1029f00e1842 (patch) | |
| tree | 736036a1a493ad2d10b9418996350a247c0ff637 /src/battle_dome.c | |
| parent | 0bbe03f17030c8009508714fc2b41703f1a1310a (diff) | |
| parent | f58cc47e173900537200c796501386f4e3a1f0d6 (diff) | |
Merge pull request #389 from DizzyEggg/num_stats
Use PARTY_SIZE and rename BATTLE_STATS_NO to NUM_BATTLE_STATS
Diffstat (limited to 'src/battle_dome.c')
| -rw-r--r-- | src/battle_dome.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 2a77da180..f0627e48d 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2756,17 +2756,17 @@ static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 natu s32 i, count; u8 bits; u16 resultingEvs; - s32 evs[6]; + s32 evs[NUM_STATS]; count = 0, bits = evBits; - for (i = 0; i < 6; bits >>= 1, i++) + for (i = 0; i < NUM_STATS; bits >>= 1, i++) { if (bits & 1) count++; } resultingEvs = MAX_TOTAL_EVS / count; - for (i = 0; i < 6; bits <<= 1, i++) + for (i = 0; i < NUM_STATS; bits <<= 1, i++) { evs[i] = 0; if (evBits & bits) @@ -4953,7 +4953,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) for (i = 0; i < 3; i++) { s32 evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread; - for (k = 0, j = 0; j < 6; j++) + for (k = 0, j = 0; j < NUM_STATS; j++) { allocatedArray[j] = 0; if (evBits & 1) @@ -4962,7 +4962,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) } k = MAX_TOTAL_EVS / k; evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread; - for (j = 0; j < 6; j++) + for (j = 0; j < NUM_STATS; j++) { if (evBits & 1) allocatedArray[j] = k; |