diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/joypad.asm | 36 | ||||
| -rw-r--r-- | home/map.asm | 10 | ||||
| -rw-r--r-- | home/map_objects.asm | 14 |
3 files changed, 30 insertions, 30 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index 8dbe2cc5c..9612427eb 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -346,14 +346,14 @@ WaitPressAorB_BlinkCursor:: ; ; NOTE: The cursor has to be shown before calling ; this function or no cursor will be shown at all. - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] push af - ldh a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndex] push af xor a - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld a, 6 - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a .loop push hl @@ -367,9 +367,9 @@ WaitPressAorB_BlinkCursor:: jr z, .loop pop af - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a pop af - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ret SimpleWaitPressAorB:: @@ -447,37 +447,37 @@ BlinkCursor:: cp b pop bc jr nz, .place_arrow - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] dec a - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ret nz - ldh a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndex] dec a - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a ret nz ld a, "─" ld [hl], a ld a, -1 - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld a, 6 - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a ret .place_arrow - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] and a ret z dec a - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ret nz dec a - ldh [hMapObjectIndexBuffer], a - ldh a, [hObjectStructIndexBuffer] + ldh [hMapObjectIndex], a + ldh a, [hObjectStructIndex] dec a - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a ret nz ld a, 6 - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a ld a, "▼" ld [hl], a ret diff --git a/home/map.asm b/home/map.asm index 096abc9eb..6e99237e0 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1124,7 +1124,7 @@ CoordinatesEventText:: text_end CheckObjectMask:: - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] ld e, a ld d, 0 ld hl, wObjectMasks @@ -1133,7 +1133,7 @@ CheckObjectMask:: ret MaskObject:: - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] ld e, a ld d, 0 ld hl, wObjectMasks @@ -1142,7 +1142,7 @@ MaskObject:: ret UnmaskObject:: - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] ld e, a ld d, 0 ld hl, wObjectMasks @@ -1433,7 +1433,7 @@ SaveScreen:: ld de, wScreenSave ld a, [wMapWidth] add 6 - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a ld a, [wPlayerStepDirection] and a jr z, .down @@ -1447,7 +1447,7 @@ SaveScreen:: .up ld de, wScreenSave + SCREEN_META_WIDTH - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] ld c, a ld b, 0 add hl, bc diff --git a/home/map_objects.asm b/home/map_objects.asm index 64374c973..9e80e8cbe 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -20,7 +20,7 @@ GetSpriteVTile:: ld hl, wUsedSprites + 2 ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld b, a - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] cp 0 jr z, .nope ld a, b @@ -210,14 +210,14 @@ GetMapObject:: CheckObjectVisibility:: ; Sets carry if the object is not visible on the screen. - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp -1 jr z, .not_visible - ldh [hObjectStructIndexBuffer], a + ldh [hObjectStructIndex], a call GetObjectStruct and a ret @@ -301,21 +301,21 @@ CheckObjectTime:: ret CopyMapObjectStruct:: ; unreferenced - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a call GetMapObject call CopyObjectStruct ret UnmaskCopyMapObjectStruct:: - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a call UnmaskObject - ldh a, [hMapObjectIndexBuffer] + ldh a, [hMapObjectIndex] call GetMapObject farcall CopyObjectStruct ret ApplyDeletionToMapObject:: - ldh [hMapObjectIndexBuffer], a + ldh [hMapObjectIndex], a call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc |