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 /src | |
| parent | 3bf812939654ea092667bc2116783e6993941305 (diff) | |
Rename CONTACT macros to ON_DAMAGE
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_script_commands.c | 4 | ||||
| -rw-r--r-- | src/battle_util.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 14158376c..118a16759 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4535,8 +4535,8 @@ static void Cmd_moveend(void) effect = TRUE; gBattleScripting.moveendState++; break; - case MOVEEND_CONTACT_ABILITIES: // Also includes Color Change - if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBattlerTarget, 0, 0, 0)) + case MOVEEND_ON_DAMAGE_ABILITIES: // Contact abilities and Color Change + if (AbilityBattleEffects(ABILITYEFFECT_ON_DAMAGE, gBattlerTarget, 0, 0, 0)) effect = TRUE; gBattleScripting.moveendState++; break; diff --git a/src/battle_util.c b/src/battle_util.c index 2d9693766..8587bb88e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2084,7 +2084,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_CONTACT: // Also includes Color Change + case ABILITYEFFECT_ON_DAMAGE: // Contact abilities and Color Change switch (gLastUsedAbility) { case ABILITY_COLOR_CHANGE: |