diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-11-04 19:40:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-04 19:40:58 -0500 |
| commit | 9ebe549347aa16ae3f10d3261242bb1e7bbb6ca6 (patch) | |
| tree | 521a897c2da997534abd6f6adc1625968bc4603a /home/map_objects.asm | |
| parent | c9563d5c5e8e3612ac40d70d6f6f5e03ba231f16 (diff) | |
| parent | d076159745e688bd58f1e512c4e0fcdd942161e9 (diff) | |
Merge pull request #654 from Rangi42/master
Miscellaneous cleanup issues
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 162bfbc5c..42ac95cf2 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -202,7 +202,7 @@ CheckStandingOnEntrance:: GetMapObject:: ; Return the location of map object a in bc. ld hl, wMapObjects - ld bc, OBJECT_LENGTH + ld bc, MAPOBJECT_LENGTH call AddNTimes ld b, h ld c, l @@ -358,7 +358,7 @@ CopyPlayerObjectTemplate:: ld [de], a inc de pop hl - ld bc, OBJECT_LENGTH - 1 + ld bc, MAPOBJECT_LENGTH - 1 call CopyBytes ret @@ -370,7 +370,7 @@ Unreferenced_Function19b8: push af ld [hl], -1 inc hl - ld bc, OBJECT_LENGTH - 1 + ld bc, MAPOBJECT_LENGTH - 1 xor a call ByteFill pop af @@ -424,7 +424,7 @@ FindFirstEmptyObjectStruct:: push bc push de ld hl, wObjectStructs - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH ld c, NUM_OBJECT_STRUCTS .loop ld a, [hl] @@ -594,7 +594,7 @@ UpdateSprites:: ret GetObjectStruct:: - ld bc, OBJECT_STRUCT_LENGTH + ld bc, OBJECT_LENGTH ld hl, wObjectStructs call AddNTimes ld b, h |