summaryrefslogtreecommitdiff
path: root/engine/overworld/movement.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld/movement.asm')
-rwxr-xr-xengine/overworld/movement.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 74e44cd3..d98b47ee 100755
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -1,6 +1,6 @@
GetMovementByte:
- ld hl, wMovementDataPointerBank
- call GetMovementByte_
+ ld hl, wMovementDataBank
+ call _GetMovementByte
ret
Function4fbd:
@@ -9,7 +9,7 @@ Function4fbd:
ld e, [hl]
inc [hl]
ld d, $0
- ld hl, wMovementPerson
+ ld hl, wMovementObject
ld a, [hli]
ld h, [hl]
ld l, a
@@ -36,7 +36,7 @@ Function4fdf: ; 4fdf (1:4fdf)
jp Function4fe9
GetMovementPerson
- ld a, [wMovementPerson]
+ ld a, [wMovementObject]
ret
Function4fe9: ; 4fe9 (1:4fe9)
@@ -302,7 +302,7 @@ Function517a: ; 517a (1:517a)
Function519c: ; 519c (1:519c)
call DeleteMapObject
ld hl, wObjectFollow_Leader
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr nz, .asm_51a9
ld [hl], $ff
@@ -719,7 +719,7 @@ Function53b1: ; 53b1 (1:53b1)
call Function54f5
.asm_53cf
ld hl, wCenteredObject
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
cp [hl]
jr z, .asm_53de
ld hl, $9
@@ -740,7 +740,7 @@ Function53e5: ; 53e5 (1:53e5)
add hl, bc
ld [hl], $4
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_5400
ld hl, $9
@@ -761,7 +761,7 @@ Function5407: ; 5407 (1:5407)
add hl, bc
ld [hl], $1
ld hl, wCenteredObject
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
cp [hl]
jr z, .asm_5422
ld hl, $9