From bb236b490d99fef02ed172e7ca86f6c70ef09527 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Sep 2019 17:58:12 -0400 Subject: Update BS constants for Cmd rename --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_util.c') diff --git a/src/battle_util.c b/src/battle_util.c index 03f1482da..6ef51bfd2 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_MOVE_END: // Think contact abilities. + case ABILITYEFFECT_CONTACT: // Also includes Color Change switch (gLastUsedAbility) { case ABILITY_COLOR_CHANGE: -- cgit v1.2.3 From 73b96fe145bf3498feb23373830ec3d7e3e2adba Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Sep 2019 12:27:36 -0400 Subject: Rename CONTACT macros to ON_DAMAGE --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_util.c') 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: -- cgit v1.2.3