diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-09 15:45:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 15:45:36 -0400 |
| commit | 038d247e147eec5a3b59eb8272979a686fe5c646 (patch) | |
| tree | 0e841011f7332cab76557ed3c0feacb03767b72f /src | |
| parent | 5a326a11f48cd1993443a2924a9fda25e6f6153f (diff) | |
| parent | 4ba2799849534d84c1d6ffdf5faf452fe30e5abc (diff) | |
Merge pull request #1091 from Flametix/target
Replace magic number with MOVE_TARGET_BOTH
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index a6128572f..329240f99 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3234,7 +3234,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage /= 2; } - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == 8 && CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) == 2) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == MOVE_TARGET_BOTH && CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) == 2) damage /= 2; // moves always do at least 1 damage. @@ -3281,7 +3281,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage /= 2; } - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == 8 && CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) == 2) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == MOVE_TARGET_BOTH && CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) == 2) damage /= 2; // are effects of weather negated with cloud nine or air lock |