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

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)); MulModifier(&modifier, UQ_4_12(1.3));
break; break;
case ABILITY_SAND_FORCE: 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)); MulModifier(&modifier, UQ_4_12(1.3));
break; break;
case ABILITY_RIVALRY: case ABILITY_RIVALRY: