diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 4db25d4743..e0bfa82b31 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -16736,6 +16736,8 @@ bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) && !IsMoveParentalBondBanned(move) && GetMoveCategory(move) != DAMAGE_CATEGORY_STATUS && GetMoveStrikeCount(move) < 2 + && GetMoveEffect(move) != EFFECT_SEMI_INVULNERABLE + && GetMoveEffect(move) != EFFECT_TWO_TURNS_ATTACK && GetMoveEffect(move) != EFFECT_MULTI_HIT) { if (IsDoubleBattle()) diff --git a/test/battle/ability/parental_bond.c b/test/battle/ability/parental_bond.c index 40f70252f9..9bd6570490 100644 --- a/test/battle/ability/parental_bond.c +++ b/test/battle/ability/parental_bond.c @@ -318,6 +318,40 @@ SINGLE_BATTLE_TEST("Parental Bond only triggers Dragon Tail's target switch out } } +SINGLE_BATTLE_TEST("Parental Bond does not trigger on semi-invulnerable moves") +{ + GIVEN { + ASSUME(GetMoveCategory(MOVE_FLY) != DAMAGE_CATEGORY_STATUS); + ASSUME(GetMoveStrikeCount(MOVE_FLY) < 2); + ASSUME(GetMoveEffect(MOVE_FLY) == EFFECT_SEMI_INVULNERABLE); + PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_FLY, gimmick: GIMMICK_MEGA); MOVE(opponent, MOVE_CELEBRATE); } + TURN { SKIP_TURN(player); } + } SCENE { + HP_BAR(opponent); + NOT HP_BAR(opponent); + } +} + +SINGLE_BATTLE_TEST("Parental Bond does not trigger on two turn attacks") +{ + GIVEN { + ASSUME(GetMoveCategory(MOVE_RAZOR_WIND) != DAMAGE_CATEGORY_STATUS); + ASSUME(GetMoveStrikeCount(MOVE_RAZOR_WIND) < 2); + ASSUME(GetMoveEffect(MOVE_RAZOR_WIND) == EFFECT_TWO_TURNS_ATTACK); + PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_RAZOR_WIND, gimmick: GIMMICK_MEGA); MOVE(opponent, MOVE_CELEBRATE); } + TURN { SKIP_TURN(player); } + } SCENE { + HP_BAR(opponent); + NOT HP_BAR(opponent); + } +} + TO_DO_BATTLE_TEST("Parental Bond tests"); // Temporary TODO: Convert Bulbapedia description into tests.