ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed pointless use of preproc directives

Browse Source
This commit is contained in:
LOuroboros 2022-03-30 02:05:54 -03:00
parent 434f6cf5ad
commit a127cb32bb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_util.c
View File

@ -7964,9 +7964,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
// todo // todo
break; break;
case EFFECT_FLING: case EFFECT_FLING:
#ifdef ITEM_EXPANSION
basePower = ItemId_GetFlingPower(gBattleMons[battlerAtk].item); basePower = ItemId_GetFlingPower(gBattleMons[battlerAtk].item);
#endif
break; break;
case EFFECT_ERUPTION: case EFFECT_ERUPTION:
basePower = gBattleMons[battlerAtk].hp * basePower / gBattleMons[battlerAtk].maxHP; basePower = gBattleMons[battlerAtk].hp * basePower / gBattleMons[battlerAtk].maxHP;
@ -9644,9 +9642,7 @@ bool32 CanFling(u8 battlerId)
#endif #endif
|| gFieldStatuses & STATUS_FIELD_MAGIC_ROOM || gFieldStatuses & STATUS_FIELD_MAGIC_ROOM
|| gDisableStructs[battlerId].embargoTimer != 0 || gDisableStructs[battlerId].embargoTimer != 0
#ifdef ITEM_EXPANSION
|| ItemId_GetFlingPower(item) != 0 || ItemId_GetFlingPower(item) != 0
#endif
|| !CanBattlerGetOrLoseItem(battlerId, item)) || !CanBattlerGetOrLoseItem(battlerId, item))
return FALSE; return FALSE;