summaryrefslogtreecommitdiff
path: root/engine/overworld/player_object.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld/player_object.asm')
-rw-r--r--engine/overworld/player_object.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 9f1b13dd9..478c8f6c6 100644
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -132,9 +132,9 @@ CopyObjectStruct::
and a
ret nz ; masked
- ld hl, wObjectStructs + OBJECT_STRUCT_LENGTH * 1
+ ld hl, wObjectStructs + OBJECT_LENGTH * 1
ld a, 1
- ld de, OBJECT_STRUCT_LENGTH
+ ld de, OBJECT_LENGTH
.loop
ldh [hObjectStructIndexBuffer], a
ld a, [hl]
@@ -224,7 +224,7 @@ CopyMapObjectToObjectStruct:
ret
InitializeVisibleSprites:
- ld bc, wMapObjects + OBJECT_LENGTH
+ ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop
ldh [hMapObjectIndexBuffer], a
@@ -271,7 +271,7 @@ InitializeVisibleSprites:
jp c, .ret
.next
- ld hl, OBJECT_LENGTH
+ ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -311,7 +311,7 @@ CheckObjectEnteringVisibleRange::
ld d, a
ld a, [wXCoord]
ld e, a
- ld bc, wMapObjects + OBJECT_LENGTH
+ ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop_v
ldh [hMapObjectIndexBuffer], a
@@ -345,7 +345,7 @@ CheckObjectEnteringVisibleRange::
pop de
.next_v
- ld hl, OBJECT_LENGTH
+ ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l
@@ -367,7 +367,7 @@ CheckObjectEnteringVisibleRange::
ld e, a
ld a, [wYCoord]
ld d, a
- ld bc, wMapObjects + OBJECT_LENGTH
+ ld bc, wMapObjects + MAPOBJECT_LENGTH
ld a, 1
.loop_h
ldh [hMapObjectIndexBuffer], a
@@ -401,7 +401,7 @@ CheckObjectEnteringVisibleRange::
pop de
.next_h
- ld hl, OBJECT_LENGTH
+ ld hl, MAPOBJECT_LENGTH
add hl, bc
ld b, h
ld c, l