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/overworld/movement.asm | |
| parent | 17087489c6b2466b1d4b2d22d7760604d3e755f8 (diff) | |
| parent | d596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/overworld/movement.asm')
| -rw-r--r-- | engine/overworld/movement.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 3dbb0b83a..fcb8d55fb 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -377,42 +377,42 @@ Movement_tree_shake: ; 5279 Movement_remove_sliding: ; 5293 ld hl, OBJECT_FLAGS1 add hl, bc - res SLIDING, [hl] + res SLIDING_F, [hl] jp ContinueReadingMovement ; 529c Movement_set_sliding: ; 529c ld hl, OBJECT_FLAGS1 add hl, bc - set SLIDING, [hl] + set SLIDING_F, [hl] jp ContinueReadingMovement ; 52a5 Movement_remove_fixed_facing: ; 52a5 ld hl, OBJECT_FLAGS1 add hl, bc - res FIXED_FACING, [hl] + res FIXED_FACING_F, [hl] jp ContinueReadingMovement ; 52ae Movement_fix_facing: ; 52ae ld hl, OBJECT_FLAGS1 add hl, bc - set FIXED_FACING, [hl] + set FIXED_FACING_F, [hl] jp ContinueReadingMovement ; 52b7 Movement_show_object: ; 52b7 ld hl, OBJECT_FLAGS1 add hl, bc - res INVISIBLE, [hl] + res INVISIBLE_F, [hl] jp ContinueReadingMovement ; 52c0 Movement_hide_object: ; 52c0 ld hl, OBJECT_FLAGS1 add hl, bc - set INVISIBLE, [hl] + set INVISIBLE_F, [hl] jp ContinueReadingMovement ; 52c9 @@ -838,7 +838,7 @@ JumpStep: ; 548a ld hl, OBJECT_FLAGS2 add hl, bc - res OVERHEAD, [hl] + res OVERHEAD_F, [hl] ld hl, OBJECT_ACTION add hl, bc |