diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /src/battle_dome.c | |
parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/battle_dome.c')
-rw-r--r-- | src/battle_dome.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 6f3d111ba..151bfc927 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4692,7 +4692,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) allocatedArray[NUM_STATS] += allocatedArray[STAT_HP]; // Add the EVs with the nature modifier for this mon and and track number of negative natures - for (j = 0; j < NUM_EV_STATS; j++) + for (j = 0; j < NUM_NATURE_STATS; j++) { if (trainerId == TRAINER_FRONTIER_BRAIN) nature = GetFrontierBrainMonNature(i); @@ -4706,7 +4706,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) else if (gNatureStatTable[nature][j] < 0) { allocatedArray[j + NUM_STATS + 1] += (allocatedArray[j + 1] * 90) / 100; - allocatedArray[j + NUM_STATS + NUM_EV_STATS + 2]++; + allocatedArray[j + NUM_STATS + NUM_NATURE_STATS + 2]++; } else { @@ -4742,7 +4742,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) } allocatedArray[NUM_STATS] += allocatedArray[STAT_HP]; - for (j = 0; j < NUM_EV_STATS; j++) + for (j = 0; j < NUM_NATURE_STATS; j++) { nature = gFacilityTrainerMons[DOME_MONS[trainerTourneyId][i]].nature; if (gNatureStatTable[nature][j] > 0) @@ -4752,7 +4752,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId) else if (gNatureStatTable[nature][j] < 0) { allocatedArray[j + NUM_STATS + 1] += (allocatedArray[j + 1] * 90) / 100; - allocatedArray[j + NUM_STATS + NUM_EV_STATS + 2]++; + allocatedArray[j + NUM_STATS + NUM_NATURE_STATS + 2]++; } else { |