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 | |
| parent | 1a84ca4e552c6b5c98500475a5bc177f59e3b42a (diff) | |
Unify step_sleep macro
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_objects.asm | 10 | ||||
| -rw-r--r-- | engine/movement.asm | 8 | ||||
| -rwxr-xr-x | engine/player_movement.asm | 6 | ||||
| -rwxr-xr-x | engine/player_object.asm | 2 | ||||
| -rw-r--r-- | engine/scripting.asm | 4 |
5 files changed, 15 insertions, 15 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 diff --git a/engine/movement.asm b/engine/movement.asm index 5a05aab49..3cc2796db 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -55,8 +55,8 @@ MovementPointers: ; 5075 dw Movement_fast_jump_step_up ; 35 dw Movement_fast_jump_step_left ; 36 dw Movement_fast_jump_step_right ; 37 - dw Movement_remove_sliding ; 38 - dw Movement_set_sliding ; 39 + dw Movement_remove_sliding ; 38 + dw Movement_set_sliding ; 39 dw Movement_remove_fixed_facing ; 3a dw Movement_fix_facing ; 3b dw Movement_show_person ; 3c @@ -85,10 +85,10 @@ MovementPointers: ; 5075 dw Movement_hide_emote ; 53 dw Movement_show_emote ; 54 dw Movement_step_shake ; 55 - dw Movement_tree_shake ; 56 + dw Movement_tree_shake ; 56 dw Movement_rock_smash ; 57 dw Movement_return_dig ; 58 - dw Movement_skyfall_top ; 59 + dw Movement_skyfall_top ; 59 ; 5129 diff --git a/engine/player_movement.asm b/engine/player_movement.asm index d02d1e5b2..d0b89d014 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -1,7 +1,7 @@ DoPlayerMovement:: ; 80000 call .GetDPad - ld a, movement_step_sleep_1 + ld a, movement_step_sleep ld [MovementAnimation], a xor a ld [wd041], a @@ -528,7 +528,7 @@ DoPlayerMovement:: ; 80000 .StandInPlace: ; 802b3 ld a, 0 ld [wd04e], a - ld a, movement_step_sleep_1 + ld a, movement_step_sleep ld [MovementAnimation], a xor a ret @@ -835,7 +835,7 @@ CheckStandingOnIce:: ; 80404 Function80422:: ; 80422 ld hl, wPlayerNextMovement - ld a, movement_step_sleep_1 + ld a, movement_step_sleep cp [hl] ret z diff --git a/engine/player_object.asm b/engine/player_object.asm index 73af9770a..bb19a144f 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -516,7 +516,7 @@ CopyTempObjectToObjectStruct: ; 8286 TrainerWalkToPlayer: ; 831e ld a, [hLastTalked] call InitMovementBuffer - ld a, movement_step_sleep_1 + ld a, movement_step_sleep call AppendToMovementBuffer ld a, [wd03f] dec a diff --git a/engine/scripting.asm b/engine/scripting.asm index 076ca3b79..745948a6f 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1427,12 +1427,12 @@ ShowEmoteScript: ; 973b6 .Show: show_emote - step_sleep_1 + step_sleep 1 step_end .Hide: hide_emote - step_sleep_1 + step_sleep 1 step_end ; 973c7 |