atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Another Pledge fix, Powder this time (#5341)

Browse source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2024-09-08 16:17:18 +02:00 committed by GitHub
parent d6d2f2033d
commit b8251e3a75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/battle_util.c
View file

@ -3551,6 +3551,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType)
gProtectStructs[gBattlerAttacker].powderSelfDmg = TRUE; gProtectStructs[gBattlerAttacker].powderSelfDmg = TRUE;
gBattleMoveDamage = GetNonDynamaxMaxHP(gBattlerAttacker) / 4; gBattleMoveDamage = GetNonDynamaxMaxHP(gBattlerAttacker) / 4;
gBattlescriptCurrInstr = BattleScript_MoveUsedPowder; gBattlescriptCurrInstr = BattleScript_MoveUsedPowder;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
effect = 1; effect = 1;
} }
} }

24
test/battle/move_effect/pledge.c
View file

@ -812,3 +812,27 @@ DOUBLE_BATTLE_TEST("Pledge move combo doesn't trigger on opponent's Pledge move
HP_BAR(opponentRight); HP_BAR(opponentRight);
} }
} }
DOUBLE_BATTLE_TEST("Pledge move combo doesn't trigger on opponent's Pledge move - Powder")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(playerLeft, MOVE_POWDER, target: opponentRight);
MOVE(opponentLeft, MOVE_GRASS_PLEDGE, target: playerLeft);
MOVE(opponentRight, MOVE_FIRE_PLEDGE, target: playerLeft);
MOVE(playerRight, MOVE_FIRE_PLEDGE, target: opponentLeft); }
} SCENE {
NONE_OF {
ANIMATION(ANIM_TYPE_MOVE, MOVE_FIRE_PLEDGE, opponentLeft);
ANIMATION(ANIM_TYPE_MOVE, MOVE_FIRE_PLEDGE, opponentRight);
ANIMATION(ANIM_TYPE_MOVE, MOVE_GRASS_PLEDGE, opponentRight);
ANIMATION(ANIM_TYPE_MOVE, MOVE_FIRE_PLEDGE, playerLeft);
}
ANIMATION(ANIM_TYPE_MOVE, MOVE_FIRE_PLEDGE, playerRight);
HP_BAR(opponentLeft);
}
}