From 8b2774e07d5a907fbbd191e138b0427c9d5133eb Mon Sep 17 00:00:00 2001 From: AlexOn1ine Date: Fri, 26 Jul 2024 20:19:58 +0200 Subject: [PATCH] Fixes cantBeSurpressed ability check for breakable abilities --- src/battle_util.c | 1 - test/battle/ability/disguise.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 9ea7a453cb..2cd38c5559 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6224,7 +6224,6 @@ u32 GetBattlerAbility(u32 battler) && gStatuses3[battler] & STATUS3_GASTRO_ACID && gBattleMons[battler].ability == ABILITY_COMATOSE) return ABILITY_NONE; - return gBattleMons[battler].ability; } if (gStatuses3[battler] & STATUS3_GASTRO_ACID) diff --git a/test/battle/ability/disguise.c b/test/battle/ability/disguise.c index 7d3e36bf78..c4f79d8fe3 100644 --- a/test/battle/ability/disguise.c +++ b/test/battle/ability/disguise.c @@ -121,3 +121,16 @@ SINGLE_BATTLE_TEST("Disguised Mimikyu takes damage from Rough Skin without break EXPECT_EQ(player->species, SPECIES_MIMIKYU_DISGUISED); } } + +SINGLE_BATTLE_TEST("Disguised Mimikyu is ignored by Mold Breaker") +{ + GIVEN { + PLAYER(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); } + OPPONENT(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } + } WHEN { + TURN { MOVE(opponent, MOVE_AERIAL_ACE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_AERIAL_ACE, opponent); + NOT ABILITY_POPUP(player, ABILITY_DISGUISE); + } +}