diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:54:28 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:54:28 -0500 |
| commit | 5db892782adaa5bb5a3e4cd6fa06565764bd1fb0 (patch) | |
| tree | 006b809d2d77e34b57db5688fa9529f8cc7ab64b /engine/overworld/player_object.asm | |
| parent | 99e66c25577e367d6c7ca75fea8b466b54c3317a (diff) | |
Remove "Buffer" suffix from two HRAM labels
Diffstat (limited to 'engine/overworld/player_object.asm')
| -rw-r--r-- | engine/overworld/player_object.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index f9976a037..84a2c4e16 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -41,10 +41,10 @@ SpawnPlayer: .ok ld [hl], e ld a, PLAYER_OBJECT - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld bc, wMapObjects ld a, PLAYER_OBJECT - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a ld de, wObjectStructs call CopyMapObjectToObjectStruct ld a, PLAYER @@ -94,7 +94,7 @@ WriteObjectXY:: ld hl, OBJECT_NEXT_MAP_Y add hl, bc ld e, [hl] - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] ld b, a call CopyDECoordsToMapObject and a @@ -138,12 +138,12 @@ CopyObjectStruct:: ld a, 1 ld de, OBJECT_LENGTH .loop - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a ld a, [hl] and a jr z, .done add hl, de - ldh a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndex] inc a cp NUM_OBJECT_STRUCTS jr nz, .loop @@ -169,12 +169,12 @@ CopyMapObjectToObjectStruct: ret .CopyMapObjectToTempObject: - ldh a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndex] ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld [hl], a - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] ld [wTempObjectCopyMapObjectIndex], a ld hl, MAPOBJECT_SPRITE @@ -229,7 +229,7 @@ InitializeVisibleSprites: ld bc, wMap1Object ld a, 1 .loop - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] @@ -277,7 +277,7 @@ InitializeVisibleSprites: add hl, bc ld b, h ld c, l - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] inc a cp NUM_OBJECTS jr nz, .loop @@ -316,7 +316,7 @@ CheckObjectEnteringVisibleRange:: ld bc, wMap1Object ld a, 1 .loop_v - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] @@ -351,7 +351,7 @@ CheckObjectEnteringVisibleRange:: add hl, bc ld b, h ld c, l - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] inc a cp NUM_OBJECTS jr nz, .loop_v @@ -372,7 +372,7 @@ CheckObjectEnteringVisibleRange:: ld bc, wMap1Object ld a, 1 .loop_h - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] @@ -407,7 +407,7 @@ CheckObjectEnteringVisibleRange:: add hl, bc ld b, h ld c, l - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] inc a cp NUM_OBJECTS jr nz, .loop_h @@ -680,7 +680,7 @@ FollowNotExact:: ld hl, OBJECT_SPRITE_Y add hl, de ld [hl], a - ldh a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndex] ld hl, OBJECT_RANGE add hl, de ld [hl], a |