diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
commit | aa6e1a91fc89d01ad65eb532d6832767c936807a (patch) | |
tree | 77ea1ef0aa2dff7e70165741fcc455c8faaadfc7 /include/battle_util.h | |
parent | 46e957bacd9ba5538262c89bb87e1915167bb201 (diff) | |
parent | d05339979e39580b162e618087136bb220a4f20d (diff) |
Merge branch 'master' into vs_seeker
Diffstat (limited to 'include/battle_util.h')
-rw-r--r-- | include/battle_util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index 81eb85dc7..25e26719b 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -30,6 +30,10 @@ #define ABILITYEFFECT_CHECK_ON_FIELD 0x13 #define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF +#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0)) +#define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0)) +#define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0)) + #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))) @@ -80,5 +84,6 @@ void ClearFuryCutterDestinyBondGrudge(u8 bank); void HandleAction_RunBattleScript(void); u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 IsMonDisobedient(void); +void MarkBufferBankForExecution(u8 battlerId); #endif // GUARD_BATTLE_UTIL_H |