diff options
Diffstat (limited to 'engine/player_object.asm')
| -rwxr-xr-x | engine/player_object.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/player_object.asm b/engine/player_object.asm index 930d71b3e..6b38a6328 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -474,7 +474,7 @@ CopyTempObjectToObjectStruct: ; 8286 sub [hl] and $f swap a - ld hl, wFollowNotExactPersonY + ld hl, wPlayerBGMapOffsetY sub [hl] ld hl, OBJECT_SPRITE_Y add hl, de @@ -492,7 +492,7 @@ CopyTempObjectToObjectStruct: ; 8286 sub [hl] and $f swap a - ld hl, wFollowNotExactPersonX + ld hl, wPlayerBGMapOffsetX sub [hl] ld hl, OBJECT_SPRITE_X add hl, de @@ -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 @@ -598,10 +598,10 @@ Special_SurfStartStep: ; 8379 ret .movement_data - slow_step_down - slow_step_up - slow_step_left - slow_step_right + slow_step DOWN + slow_step UP + slow_step LEFT + slow_step RIGHT FollowNotExact:: ; 839e push bc @@ -660,7 +660,7 @@ FollowNotExact:: ; 839e sub [hl] and $f swap a - ld hl, wFollowNotExactPersonX + ld hl, wPlayerBGMapOffsetX sub [hl] ld hl, OBJECT_SPRITE_X add hl, de @@ -673,7 +673,7 @@ FollowNotExact:: ; 839e sub [hl] and $f swap a - ld hl, wFollowNotExactPersonY + ld hl, wPlayerBGMapOffsetY sub [hl] ld hl, OBJECT_SPRITE_Y add hl, de @@ -827,12 +827,12 @@ QueueFollowerFirstStep: ; 848a jr z, .check_y jr c, .left and a - ld a, movement_step_right + ld a, movement_step + RIGHT ret .left and a - ld a, movement_step_left + ld a, movement_step + LEFT ret .check_y @@ -843,12 +843,12 @@ QueueFollowerFirstStep: ; 848a jr z, .same_xy jr c, .up and a - ld a, movement_step_down + ld a, movement_step + DOWN ret .up and a - ld a, movement_step_up + ld a, movement_step + UP ret .same_xy |