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

Remove leftover code (#7397)

Browse Source
This commit is contained in:
Alex 2025-07-25 15:32:20 +02:00 committed by GitHub
parent c544fee140
commit e222b725d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/battle_util.c
View File

@ -6037,29 +6037,6 @@ enum ItemEffect TryHandleSeed(u32 battler, u32 terrainFlag, u32 statId, u32 item
return ITEM_NO_EFFECT;
}
static enum ItemEffect TryEjectPack(u32 battler, enum ItemCaseId caseID)
{
if (gProtectStructs[battler].tryEjectPack
&& !gProtectStructs[battler].disableEjectPack
&& CountUsablePartyMons(battler) > 0
&& !(GetMoveEffect(gCurrentMove) == EFFECT_PARTING_SHOT && CanBattlerSwitch(gBattlerAttacker))) // Does not activate if attacker used Parting Shot and can switch out
{
gProtectStructs[battler].tryEjectPack = FALSE;
gBattleScripting.battler = battler;
gAiLogicData->ejectPackSwitch = TRUE;
if (caseID == ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN)
{
BattleScriptExecute(BattleScript_EjectPackActivate_End2);
}
else
{
BattleScriptCall(BattleScript_EjectPackActivate_Ret);
}
return ITEM_STATS_CHANGE;
}
return ITEM_NO_EFFECT;
}
static enum ItemEffect ConsumeBerserkGene(u32 battler, enum ItemCaseId caseID)
{
if (CanBeInfinitelyConfused(battler))
@ -6723,9 +6700,6 @@ u32 ItemBattleEffects(enum ItemCaseId caseID, u32 battler)
break;
}
break;
case HOLD_EFFECT_EJECT_PACK:
effect = TryEjectPack(battler, caseID);
break;
case HOLD_EFFECT_BERSERK_GENE:
effect = ConsumeBerserkGene(battler, caseID);
break;