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

Fix Magic Coat reflecting hazard moves incorrectly when used by a partner (#8272)

Browse Source
This commit is contained in:
moostoet 2025-11-17 18:03:41 +01:00 committed by GitHub
parent 13bae5d1b2
commit 7fd1404354
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/battle_script_commands.c
View File

@ -1167,7 +1167,26 @@ static void Cmd_attackcanceler(void)
}
u32 isBounceable = MoveCanBeBouncedBack(gCurrentMove);
if (gProtectStructs[gBattlerTarget].bounceMove
bool32 bounceActive = (gProtectStructs[gBattlerTarget].bounceMove && IsBattlerAlive(gBattlerTarget));
if (!bounceActive
&& !gBattleStruct->bouncedMoveIsUsed
&& isBounceable
&& GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove) == MOVE_TARGET_OPPONENTS_FIELD)
{
u32 partner = BATTLE_PARTNER(gBattlerTarget);
if (partner < gBattlersCount
&& GetBattlerSide(partner) == GetBattlerSide(gBattlerTarget)
&& gProtectStructs[partner].bounceMove
&& IsBattlerAlive(partner))
{
gBattlerTarget = partner;
bounceActive = TRUE;
}
}
if (bounceActive
&& isBounceable
&& !gBattleStruct->bouncedMoveIsUsed)
{

29
test/battle/move_effect/magic_coat.c
View File

@ -32,3 +32,32 @@ SINGLE_BATTLE_TEST("Magic Coat prints the correct message when bouncing back a m
STATUS_ICON(opponent, sleep: TRUE);
}
}
DOUBLE_BATTLE_TEST("Magic Coat reflects hazards regardless of the user's position")
{
struct BattlePokemon *coatUser = NULL;
PARAMETRIZE { coatUser = playerLeft; }
PARAMETRIZE { coatUser = playerRight; }
ASSUME(GetMoveEffect(MOVE_SPIKES) == EFFECT_SPIKES);
ASSUME(GetMoveEffect(MOVE_STEALTH_ROCK) == EFFECT_STEALTH_ROCK);
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(coatUser, MOVE_MAGIC_COAT); MOVE(opponentRight, MOVE_STEALTH_ROCK); MOVE(opponentLeft, MOVE_SPIKES); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, coatUser);
NONE_OF {
ANIMATION(ANIM_TYPE_MOVE, MOVE_STEALTH_ROCK, opponentRight);
ANIMATION(ANIM_TYPE_MOVE, MOVE_SPIKES, opponentLeft);
}
} THEN {
EXPECT(!IsHazardOnSide(B_SIDE_PLAYER, HAZARDS_STEALTH_ROCK));
EXPECT(!IsHazardOnSide(B_SIDE_PLAYER, HAZARDS_SPIKES));
EXPECT(IsHazardOnSide(B_SIDE_OPPONENT, HAZARDS_STEALTH_ROCK));
EXPECT(IsHazardOnSide(B_SIDE_OPPONENT, HAZARDS_SPIKES));
}
}