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_main.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_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index dee2adf0b..97c0e26bb 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3094,7 +3094,7 @@ void SwitchInClearSetData(void) if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS) { - for (i = 0; i < BATTLE_STATS_NO; i++) + for (i = 0; i < NUM_BATTLE_STATS; i++) gBattleMons[gActiveBattler].statStages[i] = 6; for (i = 0; i < gBattlersCount; i++) { @@ -3203,7 +3203,7 @@ void FaintClearSetData(void) s32 i; u8 *ptr; - for (i = 0; i < BATTLE_STATS_NO; i++) + for (i = 0; i < NUM_BATTLE_STATS; i++) gBattleMons[gActiveBattler].statStages[i] = 6; gBattleMons[gActiveBattler].status2 = 0; @@ -3357,7 +3357,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility); hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)]; *hpOnSwitchout = gBattleMons[gActiveBattler].hp; - for (i = 0; i < BATTLE_STATS_NO; i++) + for (i = 0; i < NUM_BATTLE_STATS; i++) gBattleMons[gActiveBattler].statStages[i] = 6; gBattleMons[gActiveBattler].status2 = 0; } |