diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-06-04 11:05:53 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-06-04 11:05:53 +0200 |
| commit | 5e9c785b3f5c4638e61a0e58a11b79566a054636 (patch) | |
| tree | 681ea4c043ed2c4d001ced844303151e66e3dcbf /engine/battle/effect_commands.asm | |
| parent | 17087489c6b2466b1d4b2d22d7760604d3e755f8 (diff) | |
| parent | d596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index c4bdd5de5..2723bba6b 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -364,7 +364,7 @@ CantMove: ; 341f0 ld a, BATTLE_VARS_SUBSTATUS3 call GetBattleVarAddr ld a, [hl] - and $ff ^ (1<<SUBSTATUS_BIDE + 1<<SUBSTATUS_RAMPAGE + 1<<SUBSTATUS_CHARGED) + and $ff ^ (1 << SUBSTATUS_BIDE | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_CHARGED) ld [hl], a call ResetFuryCutterCount |