Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Parental Bond with two-turn attacks (#6408)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-03-12 20:54:32 +01:00 committed by GitHub
parent a26a47cab8
commit 3ca4ce2444
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -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())

34
test/battle/ability/parental_bond.c
View File

@ -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.