diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-02 11:15:32 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-02 11:15:32 -0500 |
| commit | d35cfad0de085fab1b0c40c7f0497c9b745cb7b2 (patch) | |
| tree | 8de5a9250b7ee5e7c264e31866cf70849314166a /engine/movement.asm | |
| parent | 76e2ea534fa8374e62b8916e068514101cd617fa (diff) | |
object_struct
Diffstat (limited to 'engine/movement.asm')
| -rw-r--r-- | engine/movement.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/movement.asm b/engine/movement.asm index 8a4f09c5e..0a6851ed4 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -205,8 +205,8 @@ Movement_4a: ; 51b8 ; 51c1 Movement_step_end: ; 51c1 - call Function4769 - ld hl, OBJECT_03 + call RestoreDefaultMovement + ld hl, OBJECT_MOVEMENTTYPE add hl, bc ld [hl], a ld hl, OBJECT_27 @@ -221,8 +221,8 @@ Movement_step_end: ; 51c1 ; 51db Movement_48: ; 51db - call Function4769 - ld hl, OBJECT_03 + call RestoreDefaultMovement + ld hl, OBJECT_MOVEMENTTYPE add hl, bc ld [hl], a ld hl, OBJECT_27 @@ -242,8 +242,8 @@ Movement_48: ; 51db Movement_remove_person: ; 51fd call Function4357 - ld hl, wd4cd - ld a, [hMapObjectIndexBuffer1] + ld hl, wObjectFollow_Leader + ld a, [hMapObjectIndexBuffer] cp [hl] jr nz, .asm_520a ld [hl], $ff @@ -738,7 +738,7 @@ NormalStep: ; 5412 .asm_5430 ld hl, wd4cf - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] cp [hl] jr z, .asm_543f @@ -761,7 +761,7 @@ TurningStep: ; 5446 add hl, bc ld [hl], $4 ld hl, wd4cf - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] cp [hl] jr z, .asm_5461 ld hl, OBJECT_09 @@ -784,7 +784,7 @@ SlideStep: ; 5468 add hl, bc ld [hl], $1 ld hl, wd4cf - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] cp [hl] jr z, .asm_5483 ld hl, OBJECT_09 @@ -813,7 +813,7 @@ JumpStep: ; 548a ld [hl], $2 call Function5529 ld hl, wd4cf - ld a, [hMapObjectIndexBuffer1] + ld a, [hMapObjectIndexBuffer] cp [hl] jr z, .asm_54b1 ld hl, OBJECT_09 |