ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 15:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further updated CanFling

Browse Source
This commit is contained in:
LOuroboros 2022-01-25 21:02:26 -03:00
parent 8eaf0718ec
commit 7916ff5f47
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_util.c
View File

@ -9625,13 +9625,8 @@ bool32 CanFling(u8 battlerId)
#endif #endif
|| gFieldStatuses & STATUS_FIELD_MAGIC_ROOM || gFieldStatuses & STATUS_FIELD_MAGIC_ROOM
|| gDisableStructs[battlerId].embargoTimer != 0 || gDisableStructs[battlerId].embargoTimer != 0
|| !CanBattlerGetOrLoseItem(battlerId, item) || ItemId_GetFlingPower(item) != 0
//|| itemEffect == HOLD_EFFECT_PRIMAL_ORB || !CanBattlerGetOrLoseItem(battlerId, item))
|| itemEffect == HOLD_EFFECT_GEMS
#ifdef ITEM_ABILITY_CAPSULE
|| item == ITEM_ABILITY_CAPSULE
#endif
|| GetPocketByItemId(item) == POCKET_POKE_BALLS)
return FALSE; return FALSE;
return TRUE; return TRUE;