From 9ec31c61bfdfe01803a83f152b962ae324b8df69 Mon Sep 17 00:00:00 2001 From: May8th1995 <69943962+May8th1995@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:12:46 +0000 Subject: [PATCH] Fixes weirdly set value for eject buttons etc (#2846) * Fixes weirdly set value for eject buttons etc * Remove known fialing from fixed test --------- Co-authored-by: tennis --- data/battle_scripts_1.s | 1 + test/ability_intimidate.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 52c1352943..a32e9a4ec8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8654,6 +8654,7 @@ BattleScript_IntimidateLoopIncrement: addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_IntimidateLoop BattleScript_IntimidateEnd: + copybyte sBATTLER, gBattlerAttacker destroyabilitypopup pause B_WAIT_TIME_MED end3 diff --git a/test/ability_intimidate.c b/test/ability_intimidate.c index 347c0bc712..0318435e0b 100644 --- a/test/ability_intimidate.c +++ b/test/ability_intimidate.c @@ -98,7 +98,6 @@ DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double ba SINGLE_BATTLE_TEST("Intimidate and Eject Button force the opponent to Attack") { - KNOWN_FAILING; // Issue #2837 GIVEN { ASSUME(gItems[ITEM_EJECT_BUTTON].holdEffect == HOLD_EFFECT_EJECT_BUTTON); PLAYER(SPECIES_WOBBUFFET);