Flame Burst + Substitute fix (rh-hideout#4939)

Co-authored-by: Hedara <hedara90@gmail.com>
laserXdolphin · Jul 10, 2024 · 76d7600 · 76d7600
1 parent e1a6876
commit 76d7600
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -1519,6 +1519,7 @@ BattleScript_MoveEffectFlameBurst::
 	waitmessage B_WAIT_TIME_LONG
 	savetarget
 	copybyte gBattlerTarget, sSAVED_BATTLER
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_TARGET
 	datahpupdate BS_TARGET
 	tryfaintmon BS_TARGET

diff --git a/test/battle/move_effect/flame_burst.c b/test/battle/move_effect/flame_burst.c
@@ -0,0 +1,24 @@
+#include "global.h"
+#include "test/battle.h"
+
+ASSUMPTIONS
+{
+    ASSUME(gMovesInfo[MOVE_FLAME_BURST].additionalEffects->moveEffect == MOVE_EFFECT_FLAME_BURST);
+}
+
+//  Flame Burst AoE is supposed to hit through Substitute
+DOUBLE_BATTLE_TEST("Flame Burst Substitute")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_SUBSTITUTE].effect == EFFECT_SUBSTITUTE);
+        PLAYER(SPECIES_WOBBUFFET);
+        PLAYER(SPECIES_WYNAUT);
+        OPPONENT(SPECIES_WYNAUT);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponentLeft, MOVE_SUBSTITUTE); MOVE(playerRight, MOVE_FLAME_BURST, target: opponentRight); }
+    } SCENE {
+        MESSAGE("The bursting flames hit Foe Wynaut!");
+        NOT MESSAGE("The SUBSTITUTE took damage for Foe Wynaut!");
+    }
+}