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

Using IsBattlerTerrainAffected

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-11-06 11:07:40 -03:00
parent ae8de0f07a
commit 62b6accbcc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_main.c
View File

@ -5194,8 +5194,7 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk)
} }
else if (gBattleMoves[move].effect == EFFECT_TERRAIN_PULSE) else if (gBattleMoves[move].effect == EFFECT_TERRAIN_PULSE)
{ {
if ((gFieldStatuses & STATUS_FIELD_TERRAIN_ANY) if (IsBattlerTerrainAffected(battlerAtk, STATUS_FIELD_TERRAIN_ANY))
&& IsBattlerGrounded(battlerAtk))
{ {
if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN) if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN)
gBattleStruct->dynamicMoveType = TYPE_ELECTRIC | 0x80; gBattleStruct->dynamicMoveType = TYPE_ELECTRIC | 0x80;