diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-14 12:28:00 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-14 12:28:00 -0400 |
| commit | 3108c9fa6a265a7ecbac6fa2aaa458025f5aeead (patch) | |
| tree | 00d971d5ce33222990ad71319e3d6a3bf40fa7cd /engine/map_objects.asm | |
| parent | 1a84ca4e552c6b5c98500475a5bc177f59e3b42a (diff) | |
Unify step_sleep macro
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index a78e11f25..c2e2f9a22 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1876,8 +1876,8 @@ Function5000: ; unscripted? ld a, [wPlayerNextMovement] ld hl, wPlayerMovement ld [hl], a -; load [wPlayerNextMovement] with movement_step_sleep_1 - ld a, movement_step_sleep_1 +; load [wPlayerNextMovement] with movement_step_sleep + ld a, movement_step_sleep ld [wPlayerNextMovement], a ; recover the previous value of [wPlayerNextMovement] ld a, [hl] @@ -1987,7 +1987,7 @@ ApplyMovementToFollower: ; 54b8 cp d ret nz ld a, e - cp movement_step_sleep_1 + cp movement_step_sleep ret z cp movement_step_end ret z @@ -2034,7 +2034,7 @@ GetFollowerNextMovementByte: ; 54e6 .done call .CancelFollowIfLeaderMissing ret c - ld a, movement_step_sleep_1 + ld a, movement_step_sleep ret .CancelFollowIfLeaderMissing: @@ -2505,7 +2505,7 @@ HandleNPCStep:: ; 576a ; 579d RefreshPlayerSprite: ; 579d - ld a, movement_step_sleep_1 + ld a, movement_step_sleep ld [wPlayerNextMovement], a ld [wPlayerMovement], a xor a |