diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-23 13:15:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-23 13:15:07 -0400 |
| commit | c5d18de8ff9b587a7987cc2cde793386f1eaf217 (patch) | |
| tree | 5f5341f802eeaefe3d867a39742808ae441434ee /engine/overworld/map_object_action.asm | |
| parent | 32b92ca51c73f1ad9be169bef476b9c93687e2a4 (diff) | |
Use known sprite movement data flag constants
Diffstat (limited to 'engine/overworld/map_object_action.asm')
| -rw-r--r-- | engine/overworld/map_object_action.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index c82cd80a2..8c897d25a 100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm @@ -47,7 +47,7 @@ SetFacingStandAction: ; 44b5 SetFacingStepAction: ; 44c1 ld hl, OBJECT_FLAGS1 add hl, bc - bit SLIDING, [hl] + bit SLIDING_F, [hl] jp nz, SetFacingCurrent ld hl, OBJECT_STEP_FRAME @@ -59,7 +59,7 @@ SetFacingStepAction: ; 44c1 rrca rrca - and %00000011 + maskbits NUM_DIRECTIONS ld d, a call GetSpriteDirection @@ -74,7 +74,7 @@ SetFacingStepAction: ; 44c1 SetFacingSkyfall: ; 44e4 ld hl, OBJECT_FLAGS1 add hl, bc - bit SLIDING, [hl] + bit SLIDING_F, [hl] jp nz, SetFacingCurrent ld hl, OBJECT_STEP_FRAME @@ -86,7 +86,7 @@ SetFacingSkyfall: ; 44e4 rrca rrca - and %00000011 + maskbits NUM_DIRECTIONS ld d, a call GetSpriteDirection @@ -101,7 +101,7 @@ SetFacingSkyfall: ; 44e4 SetFacingBumpAction: ; 4508 ld hl, OBJECT_FLAGS1 add hl, bc - bit SLIDING, [hl] + bit SLIDING_F, [hl] jp nz, SetFacingCurrent ld hl, OBJECT_STEP_FRAME @@ -112,7 +112,7 @@ SetFacingBumpAction: ; 4508 rrca rrca rrca - and %00000011 + maskbits NUM_DIRECTIONS ld d, a call GetSpriteDirection @@ -245,7 +245,7 @@ SetFacingWeirdTree: ; 45ab ld a, [hl] inc a ld [hl], a - and %00001100 + maskbits NUM_DIRECTIONS, 2 rrca rrca add FACING_WEIRD_TREE_0 |