diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-04 00:47:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 00:47:16 -0400 |
| commit | d596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (patch) | |
| tree | 5bc4cbdd09186fbdf2f7e2294fdde443ff8900bd /engine/battle/effect_commands.asm | |
| parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) | |
| parent | c7bb2d15cfb32a5e965933b90e0acb497c7bf7b2 (diff) | |
Merge pull request #514 from Rangi42/master
[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes
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 fad5b27a0..5fd37e054 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 |