diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-19 18:45:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-19 18:45:38 -0400 |
| commit | 7bc152e2ed84d5c50db1f5c916f02911ce09be1e (patch) | |
| tree | ded52fb88c9df75655a7c119a88b728f9bd33198 /include/battle_util.h | |
| parent | a252140f3b462efbeaec392030479e9e12999f23 (diff) | |
| parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'include/battle_util.h')
| -rw-r--r-- | include/battle_util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index c1ff7d8ab..b21b250c4 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -33,6 +33,7 @@ #define ITEMEFFECT_ON_SWITCH_IN 0x0 #define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) +#define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0))) #define BS_GET_TARGET 0 #define BS_GET_ATTACKER 1 |