From da3d223c45c73e5f7216eb75f1a441258be6ad64 Mon Sep 17 00:00:00 2001 From: AERDU Date: Wed, 16 Jul 2025 10:41:32 +0000 Subject: [PATCH] fallback bugfix for B_DARK_VOID_FAIL < GEN_7 (#7351) --- data/battle_scripts_1.s | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a4d3264d13..d694e47467 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2856,12 +2856,6 @@ BattleScript_MoveMissed:: waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd -BattleScript_EffectDarkVoid:: -.if B_DARK_VOID_FAIL >= GEN_7 - jumpifspecies BS_ATTACKER, SPECIES_DARKRAI, BattleScript_EffectNonVolatileStatus - goto BattleScript_PokemonCantUseTheMove -.endif - BattleScript_TerrainPreventsEnd2:: pause B_WAIT_TIME_SHORT printfromtable gTerrainPreventsStringIds @@ -4683,6 +4677,11 @@ BattleScript_FlatterTryConfuse:: seteffectprimary MOVE_EFFECT_CONFUSION goto BattleScript_MoveEnd +BattleScript_EffectDarkVoid:: +.if B_DARK_VOID_FAIL >= GEN_7 + jumpifspecies BS_ATTACKER, SPECIES_DARKRAI, BattleScript_EffectNonVolatileStatus + goto BattleScript_PokemonCantUseTheMove +.endif BattleScript_EffectNonVolatileStatus:: attackcanceler attackstring