diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-14 14:18:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 14:18:29 -0600 |
| commit | b4b4fb951a588dd50b4589efea11d1a17fd88342 (patch) | |
| tree | 8bce21f083717e8b39df833136fdab956673001b /src/battle_script_commands.c | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
| parent | 87763d133fadac8270dab0cba3d964a47b5b0dd2 (diff) | |
Merge pull request #519 from DizzyEggg/trainer_hill
Trainer Hill
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 2490d6e13..0995eec45 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8459,7 +8459,7 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a c || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_BIDE) { - if ((gHitMarker & HITMARKER_x8000000)) + if ((gHitMarker & HITMARKER_CHARGING)) return 1; } return 2; |