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

Fix Shed Shell allowing fleeing/teleporting and Smoke Ball failing to guarantee escape (#8286)

Browse Source
This commit is contained in:
moostoet 2025-11-20 22:30:29 +01:00 committed by GitHub
parent 2f5dfa99f4
commit 32b4897747
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 72 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_main.c
View File

@ -4329,7 +4329,7 @@ static void HandleTurnActionSelectionState(void)
case B_ACTION_SWITCH:
gBattleStruct->battlerPartyIndexes[battler] = gBattlerPartyIndexes[battler];
if (gBattleTypeFlags & BATTLE_TYPE_ARENA
|| !CanBattlerEscape(battler))
|| (!CanBattlerEscape(battler) && GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_SHED_SHELL))
{
BtlController_EmitChoosePokemon(battler, B_COMM_TO_CONTROLLER, PARTY_ACTION_CANT_SWITCH, PARTY_SIZE, ABILITY_NONE, 0, gBattleStruct->battlerPartyOrders[battler]);
}

2
src/battle_script_commands.c
View File

@ -7433,7 +7433,7 @@ static void Cmd_jumpifcantswitch(void)
CMD_ARGS(u8 battler:7, u8 ignoreEscapePrevention:1, const u8 *jumpInstr);
u32 battler = GetBattlerForBattleScript(cmd->battler);
if (!cmd->ignoreEscapePrevention && !CanBattlerEscape(battler))
if (!cmd->ignoreEscapePrevention && !CanBattlerEscape(battler) && GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_SHED_SHELL)
{
gBattlescriptCurrInstr = cmd->jumpInstr;
}

6
src/battle_util.c
View File

@ -733,7 +733,9 @@ void HandleAction_Run(void)
}
else
{
if (!CanBattlerEscape(gBattlerAttacker))
if (GetBattlerHoldEffect(gBattlerAttacker, TRUE) != HOLD_EFFECT_CAN_ALWAYS_RUN
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_RUN_AWAY
&& !CanBattlerEscape(gBattlerAttacker))
{
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ATTACKER_CANT_ESCAPE;
gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
@ -5448,8 +5450,6 @@ bool32 CanBattlerEscape(u32 battler) // no ability check
{
if (gBattleStruct->battlerState[battler].commanderSpecies != SPECIES_NONE)
return FALSE;
else if (GetBattlerHoldEffect(battler, TRUE) == HOLD_EFFECT_SHED_SHELL)
return TRUE;
else if (B_GHOSTS_ESCAPE >= GEN_6 && IS_BATTLER_OF_TYPE(battler, TYPE_GHOST))
return TRUE;
else if (gBattleMons[battler].volatiles.escapePrevention)

67
test/battle/hold_effect/shed_shell.c Normal file
View File

@ -0,0 +1,67 @@
#include "global.h"
#include "test/battle.h"
ASSUMPTIONS
{
ASSUME(gItemsInfo[ITEM_SHED_SHELL].holdEffect == HOLD_EFFECT_SHED_SHELL);
};
SINGLE_BATTLE_TEST("Shed Shell allows switching out even when trapped by Mean Look")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SHED_SHELL); }
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_GASTLY);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_MEAN_LOOK); }
TURN { SWITCH(player, 1); MOVE(opponent, MOVE_CELEBRATE); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_MEAN_LOOK, opponent);
SWITCH_OUT_MESSAGE("Wobbuffet");
SEND_IN_MESSAGE("Wynaut");
}
}
SINGLE_BATTLE_TEST("Shed Shell allows switching out even when trapped by Shadow Tag")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SHED_SHELL); }
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_WOBBUFFET) { Ability(ABILITY_SHADOW_TAG); }
} WHEN {
TURN { SWITCH(player, 1); MOVE(opponent, MOVE_CELEBRATE); }
} SCENE {
SWITCH_OUT_MESSAGE("Wobbuffet");
SEND_IN_MESSAGE("Wynaut");
}
}
SINGLE_BATTLE_TEST("Shed Shell allows switching out even when trapped by Arena Trap")
{
GIVEN {
PLAYER(SPECIES_DIGLETT) { Item(ITEM_SHED_SHELL); } // Grounded
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_DIGLETT) { Ability(ABILITY_ARENA_TRAP); }
} WHEN {
TURN { SWITCH(player, 1); MOVE(opponent, MOVE_CELEBRATE); }
} SCENE {
SWITCH_OUT_MESSAGE("Diglett");
SEND_IN_MESSAGE("Wynaut");
}
}
SINGLE_BATTLE_TEST("Shed Shell does not allow Teleport when trapped")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_TELEPORT) == EFFECT_TELEPORT);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SHED_SHELL); Moves(MOVE_TELEPORT, MOVE_SPLASH, MOVE_CELEBRATE); }
OPPONENT(SPECIES_GASTLY);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_MEAN_LOOK); }
TURN { MOVE(player, MOVE_TELEPORT); MOVE(opponent, MOVE_CELEBRATE); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_MEAN_LOOK, opponent);
MESSAGE("Wobbuffet used Teleport!");
MESSAGE("But it failed!");
}
}