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

Fix Aroma Veil target-side check for ally-targeted limiting moves (#9157)

Browse Source
This commit is contained in:
GGbond 2026-02-08 16:15:57 +08:00 committed by GitHub
parent eb7d055d6b
commit 4d349e9210
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -4442,7 +4442,7 @@ static void Cmd_jumpifability(void)
}
break;
case BS_TARGET_SIDE:
battler = IsAbilityOnOpposingSide(gBattlerAttacker, ability);
battler = IsAbilityOnSide(gBattlerTarget, ability);
if (battler)
{
battler--;

18
test/battle/ability/aroma_veil.c
View File

@ -22,6 +22,24 @@ DOUBLE_BATTLE_TEST("Aroma Veil protects the Pokémon's side from Taunt")
}
}
DOUBLE_BATTLE_TEST("Aroma Veil protects the Pokémon's side from ally Taunt")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_TAUNT) == EFFECT_TAUNT);
ASSUME(GetMoveCategory(MOVE_HARDEN) == DAMAGE_CATEGORY_STATUS);
PLAYER(SPECIES_AROMATISSE) { Ability(ABILITY_AROMA_VEIL); Speed(1); }
PLAYER(SPECIES_WOBBUFFET) { Speed(2); }
OPPONENT(SPECIES_WOBBUFFET) { Speed(3); }
OPPONENT(SPECIES_WYNAUT) { Speed(4); }
} WHEN {
TURN { MOVE(playerRight, MOVE_TAUNT, target: playerLeft); MOVE(playerLeft, MOVE_HARDEN); }
} SCENE {
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_TAUNT, playerRight);
ABILITY_POPUP(playerLeft, ABILITY_AROMA_VEIL);
ANIMATION(ANIM_TYPE_MOVE, MOVE_HARDEN, playerLeft);
}
}
DOUBLE_BATTLE_TEST("Aroma Veil protects the Pokémon's side from Torment")
{
struct BattlePokemon *moveTarget = NULL;