diff options
| author | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-24 08:40:33 -0400 |
| commit | 72f9afcbf4a81909019f21acad0484b72ed217f6 (patch) | |
| tree | bc7e9a48b8056e28403e251dab7ac64f649ad9e4 /include/battle_util.h | |
| parent | 3964dbd4822f1b22bbc696add7e56ff0c5b2caea (diff) | |
| parent | 7ceabffc842dfdf127fd594055f895a0803f54f6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/battle_util.h')
| -rw-r--r-- | include/battle_util.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index be9b5f1fe..b3fff196e 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -12,7 +12,7 @@ #define ABILITYEFFECT_ENDTURN 0x1 #define ABILITYEFFECT_MOVES_BLOCK 0x2 #define ABILITYEFFECT_ABSORBING 0x3 -#define ABILITYEFFECT_CONTACT 0x4 +#define ABILITYEFFECT_MOVE_END 0x4 #define ABILITYEFFECT_IMMUNITY 0x5 #define ABILITYEFFECT_FORECAST 0x6 #define ABILITYEFFECT_SYNCHRONIZE 0x7 @@ -35,6 +35,8 @@ #define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0)) #define ITEMEFFECT_ON_SWITCH_IN 0x0 +#define ITEMEFFECT_MOVE_END 0x3 +#define ITEMEFFECT_KINGSROCK_SHELLBELL 0x4 #define WEATHER_HAS_EFFECT ((!ABILITY_ON_FIELD(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD(ABILITY_AIR_LOCK))) #define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) |