diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
| commit | 64b4cf624fe2175e2c7539b91bc41b6dae28a00e (patch) | |
| tree | 971ea955f5d40af7612f7b69029b49db98064690 /engine/overworld/movement.asm | |
| parent | ea9cc86949cecc3508aeac06b807372b6b0134d8 (diff) | |
| parent | d0526c036210d2ee186a2a45feac91747ef6fb85 (diff) | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/evos_moves.asm
engine/overworld/healing_machine.asm
Diffstat (limited to 'engine/overworld/movement.asm')
| -rw-r--r-- | engine/overworld/movement.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 89b09bba..f618261e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -210,9 +210,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveDown ld de, 2*SCREEN_WIDTH add hl, de ; move tile pointer two rows down - ld de, $100 - - ld bc, $400 + lb de, 1, 0 + lb bc, 4, SPRITE_FACING_DOWN jr TryWalking .notDown cp $80 ; $40 <= a < $80: up (or right) @@ -223,8 +222,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveUp ld de, -2*SCREEN_WIDTH add hl, de ; move tile pointer two rows up - ld de, $ff00 - ld bc, $804 + lb de, -1, 0 + lb bc, 8, SPRITE_FACING_UP jr TryWalking .notUp cp $c0 ; $80 <= a < $c0: left (or up) @@ -235,8 +234,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveLeft dec hl dec hl ; move tile pointer two columns left - ld de, $ff - ld bc, $208 + lb de, 0, -1 + lb bc, 2, SPRITE_FACING_LEFT jr TryWalking .notLeft ; $c0 <= a: right (or down) ld a, [wCurSpriteMovement2] @@ -245,8 +244,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveRight inc hl inc hl ; move tile pointer two columns right - ld de, $1 - ld bc, $10c + lb de, 0, 1 + lb bc, 1, SPRITE_FACING_RIGHT jr TryWalking ; changes facing direction by zeroing the movement delta and calling TryWalking |