diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index fc86c99bf1..0742c79aab 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8740,6 +8740,7 @@ static void ResetValuesForCalledMove(void) gBattleScripting.animTargetsHit = 0; SetTypeBeforeUsingMove(gCurrentMove, gBattlerAttacker); HandleMoveTargetRedirection(); + ClearDamageCalcResults(); } static void Cmd_jumptocalledmove(void) diff --git a/test/battle/ability/dancer.c b/test/battle/ability/dancer.c index b2ca70cc48..de33121e13 100644 --- a/test/battle/ability/dancer.c +++ b/test/battle/ability/dancer.c @@ -39,7 +39,7 @@ DOUBLE_BATTLE_TEST("Dancer can copy Teeter Dance and confuse both opposing targe GIVEN { ASSUME(IsDanceMove(MOVE_TEETER_DANCE)); ASSUME(gItemsInfo[ITEM_LUM_BERRY].holdEffect == HOLD_EFFECT_CURE_STATUS); - PLAYER(SPECIES_WOBBUFFET) + PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT) { Item(ITEM_LUM_BERRY); } OPPONENT(SPECIES_ORICORIO) { Ability(ABILITY_DANCER); Item(ITEM_LUM_BERRY); } OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } @@ -114,7 +114,7 @@ DOUBLE_BATTLE_TEST("Dancer still triggers if another dancer flinches") ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_DANCE, playerRight); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight); ABILITY_POPUP(playerLeft, ABILITY_DANCER); - MESSAGE("Wobbuffet flinched and couldn't move!"); + MESSAGE("Oricorio flinched and couldn't move!"); NONE_OF { MESSAGE("Oricorio used Dragon Dance!"); ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_DANCE, playerLeft);