Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

potential fix for trap effects (#9396)

Browse Source 
Co-authored-by: Meister-anon <user@DESKTOP-TQ65PS9>
This commit is contained in:
Meister-anon 2026-03-05 23:57:45 -05:00 committed by GitHub
parent 1aa594d00e
commit f2af06983a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_ai_util.c
View File

@ -497,10 +497,10 @@ bool32 IsBattlerTrapped(enum BattlerId battlerAtk, enum BattlerId battlerDef)
&& (B_SHADOW_TAG_ESCAPE >= GEN_4 && gAiLogicData->abilities[battlerDef] != ABILITY_SHADOW_TAG))
return TRUE;
if (AI_IsAbilityOnSide(battlerAtk, ABILITY_ARENA_TRAP)
&& AI_IsBattlerGrounded(battlerAtk))
&& AI_IsBattlerGrounded(battlerDef))
return TRUE;
if (AI_IsAbilityOnSide(battlerAtk, ABILITY_MAGNET_PULL)
&& IS_BATTLER_OF_TYPE(battlerAtk, TYPE_STEEL))
&& IS_BATTLER_OF_TYPE(battlerDef, TYPE_STEEL))
return TRUE;
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && CountUsablePartyMons(battlerDef) == 0)