summaryrefslogtreecommitdiff
path: root/engine/overworld/movement.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2018-08-25 22:23:45 -0400
committerGitHub <noreply@github.com>2018-08-25 22:23:45 -0400
commit3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch)
tree3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/overworld/movement.asm
parent89681d231611938a791f4256e602c88c2f9aa3e1 (diff)
parentb2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff)
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/overworld/movement.asm')
-rw-r--r--engine/overworld/movement.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index f7054c680..bc978ef0c 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -237,7 +237,7 @@ Movement_48:
Movement_remove_object:
call DeleteMapObject
ld hl, wObjectFollow_Leader
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr nz, .not_leading
ld [hl], -1
@@ -680,7 +680,7 @@ NormalStep:
.skip_grass
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .player
@@ -704,7 +704,7 @@ TurningStep:
ld [hl], OBJECT_ACTION_SPIN
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .player
@@ -728,7 +728,7 @@ SlideStep:
ld [hl], OBJECT_ACTION_STAND
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .player
@@ -760,7 +760,7 @@ JumpStep:
call SpawnShadow
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .player