atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1386 from Lukien/battle_engine

Browse source 
Added weather check for ability sand force
This commit is contained in:
ultima-soul 2021-01-31 22:01:21 -08:00 committed by GitHub
commit a41300a6dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_util.c
View file

@ -6751,7 +6751,8 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe
MulModifier(&modifier, UQ_4_12(1.3));
break;
case ABILITY_SAND_FORCE:
if (moveType == TYPE_STEEL || moveType == TYPE_ROCK || moveType == TYPE_GROUND)
if ((moveType == TYPE_STEEL || moveType == TYPE_ROCK || moveType == TYPE_GROUND)
&& WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SANDSTORM_ANY)
MulModifier(&modifier, UQ_4_12(1.3));
break;
case ABILITY_RIVALRY: