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.asm | |
| parent | c9563d5c5e8e3612ac40d70d6f6f5e03ba231f16 (diff) | |
| parent | d076159745e688bd58f1e512c4e0fcdd942161e9 (diff) | |
Merge pull request #654 from Rangi42/master
Miscellaneous cleanup issues
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/map.asm b/home/map.asm index 617ac135a..9e0c12e00 100644 --- a/home/map.asm +++ b/home/map.asm @@ -597,7 +597,7 @@ ReadObjectEvents:: ; Fill the remaining sprite IDs and y coords with 0 and -1, respectively. ; Bleeds into wObjectMasks due to a bug. Uncomment the above subtraction ; to fix. - ld bc, OBJECT_LENGTH + ld bc, MAPOBJECT_LENGTH .loop ld [hl], 0 inc hl @@ -631,7 +631,7 @@ CopyMapObjectEvents:: jr nz, .loop2 pop hl - ld bc, OBJECT_LENGTH + ld bc, MAPOBJECT_LENGTH add hl, bc pop bc dec c @@ -640,13 +640,13 @@ CopyMapObjectEvents:: ClearObjectStructs:: ld hl, wObject1Struct - ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1) + ld bc, OBJECT_LENGTH * (NUM_OBJECT_STRUCTS - 1) xor a call ByteFill ; Just to make sure (this is rather pointless) ld hl, wObject1Struct - ld de, OBJECT_STRUCT_LENGTH + ld de, OBJECT_LENGTH ld c, NUM_OBJECT_STRUCTS - 1 xor a .loop |