diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 7c33bfef0f..ebdfc59e0d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1582,7 +1582,6 @@ BattleScript_EffectAfterYou:: goto BattleScript_MoveEnd BattleScript_MoveEffectFlameBurst:: - tryfaintmon BS_TARGET printstring STRINGID_BURSTINGFLAMESHIT waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_HP_UPDATE diff --git a/test/battle/move_effect_secondary/flame_burst.c b/test/battle/move_effect_secondary/flame_burst.c index df0199e116..494a7bf9c0 100644 --- a/test/battle/move_effect_secondary/flame_burst.c +++ b/test/battle/move_effect_secondary/flame_burst.c @@ -22,3 +22,35 @@ DOUBLE_BATTLE_TEST("Flame Burst Substitute") NOT MESSAGE("The substitute took damage for the opposing Wynaut!"); } } + +DOUBLE_BATTLE_TEST("Flame Burst doesn't crash, opponent to player") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(1); } + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponentRight, MOVE_FLAME_BURST, target: playerLeft); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLAME_BURST, opponentRight); + HP_BAR(playerRight); + MESSAGE("Wobbuffet fainted!"); + } +} + +DOUBLE_BATTLE_TEST("Flame Burst doesn't crash, player to opponent") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WYNAUT) { HP(1); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(playerLeft, MOVE_FLAME_BURST, target: opponentLeft); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLAME_BURST, playerLeft); + HP_BAR(opponentRight); + MESSAGE("The opposing Wynaut fainted!"); + } +}