diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
| commit | 49c88e63439a4ca08ca9fac7a85de51d4f56c8bd (patch) | |
| tree | 69504e13ad956a1596d7f5f188279f0c25ddad55 /include/battle_util.h | |
| parent | 431e737453feb99c18349060cad53d551ba41dcf (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
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 |