diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-07 18:00:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 18:00:10 -0500 |
| commit | 42a0b20e57f7947f5ccfd61b12fdb71ef1891950 (patch) | |
| tree | 1c730449a2b91fd05dba577489814ca6faa6892a /src/battle_tower.c | |
| parent | c506cf747fa2e0a0eaff428cfd28ada7ffa58b67 (diff) | |
| parent | f02afc134b206b82bd5c73885d0ee9d8855df90a (diff) | |
Merge pull request #1295 from sphericalice/pokeemerald
Use constants for IV-related values
Diffstat (limited to 'src/battle_tower.c')
| -rw-r--r-- | src/battle_tower.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index ee75feeb4..218c3ef70 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -775,7 +775,7 @@ struct { { .species = SPECIES_METANG, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .level = 42, .nature = NATURE_BRAVE, .evs = {0, 252, 252, 0, 6, 0}, @@ -783,7 +783,7 @@ struct }, { .species = SPECIES_SKARMORY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .level = 43, .nature = NATURE_IMPISH, .evs = {252, 0, 0, 0, 6, 252}, @@ -791,7 +791,7 @@ struct }, { .species = SPECIES_AGGRON, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .level = 44, .nature = NATURE_ADAMANT, .evs = {0, 252, 0, 0, 252, 6}, @@ -1854,7 +1854,7 @@ static void FillFactoryFrontierTrainerParty(u16 trainerId, u8 firstMonId) } else { - fixedIV = 31; + fixedIV = MAX_PER_STAT_IVS; } level = SetFacilityPtrsGetLevel(); @@ -3295,7 +3295,7 @@ static u8 GetFrontierTrainerFixedIvs(u16 trainerId) else if (trainerId <= FRONTIER_TRAINER_TESS) // 200 - 219 fixedIv = 21; else // 220+ (- 299) - fixedIv = 31; + fixedIv = MAX_PER_STAT_IVS; return fixedIv; } |