diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-09-27 12:27:36 -0400 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-09-27 12:27:36 -0400 |
commit | 73b96fe145bf3498feb23373830ec3d7e3e2adba (patch) | |
tree | eb21b4b64e118db1c028c00a1e2256d34faaed0f /include | |
parent | 3bf812939654ea092667bc2116783e6993941305 (diff) |
Rename CONTACT macros to ON_DAMAGE
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_util.h | 2 | ||||
-rw-r--r-- | include/constants/battle_script_commands.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index f90d812d6..b77fa10ad 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_ON_DAMAGE 0x4 #define ABILITYEFFECT_IMMUNITY 0x5 #define ABILITYEFFECT_FORECAST 0x6 #define ABILITYEFFECT_SYNCHRONIZE 0x7 diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index dd54980c5..be215ee58 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -116,7 +116,7 @@ #define MOVEEND_RAGE 0 #define MOVEEND_DEFROST 1 #define MOVEEND_SYNCHRONIZE_TARGET 2 -#define MOVEEND_CONTACT_ABILITIES 3 +#define MOVEEND_ON_DAMAGE_ABILITIES 3 #define MOVEEND_IMMUNITY_ABILITIES 4 #define MOVEEND_SYNCHRONIZE_ATTACKER 5 #define MOVEEND_CHOICE_MOVE 6 |