diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 03:03:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 03:03:45 -0500 |
| commit | 39556605cd27a567a45bfc2c46af745ac031ab90 (patch) | |
| tree | c2ff7645625d62e94b369080ba37071eb98426d1 /src/battle_script_commands.c | |
| parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 3b9270948..527e32bcc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7352,7 +7352,7 @@ static void atk95_setsandstorm(void) static void atk96_weatherdamage(void) { - if (((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == BATTLE_TYPE_GHOST) + if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags) && (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)) { gBattleMoveDamage = 0; |