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

Fix Flame Burst timeout if primary target is fainted (#7793)

Browse Source 
Co-authored-by: Hedara <hedara90@gmail.com>
This commit is contained in:
hedara90 2025-09-25 10:39:56 +02:00 committed by GitHub
parent 27b1a17d09
commit 27b542466f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_scripts_1.s
View File

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

32
test/battle/move_effect_secondary/flame_burst.c
View File

@ -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!");
}
}