summaryrefslogtreecommitdiff
path: root/engine/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'engine/gfx')
-rw-r--r--engine/gfx/dma_transfer.asm12
-rw-r--r--engine/gfx/mon_icons.asm10
2 files changed, 11 insertions, 11 deletions
diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm
index 1f5f3e785..682302f96 100644
--- a/engine/gfx/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
@@ -415,11 +415,11 @@ PadAttrmapForHDMATransfer:
PadMapForHDMATransfer:
; pad a 20x18 map to 32x18 for HDMA transfer
-; back up the padding value in c to hMapObjectIndexBuffer
- ldh a, [hMapObjectIndexBuffer]
+; back up the padding value in c to hMapObjectIndex
+ ldh a, [hMapObjectIndex]
push af
ld a, c
- ldh [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndex], a
; for each row on the screen
ld c, SCREEN_HEIGHT
@@ -435,7 +435,7 @@ PadMapForHDMATransfer:
jr nz, .loop2
; load the original padding value of c into hl for 32 - 20 = 12 rows
- ldh a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndex]
ld b, BG_MAP_WIDTH - SCREEN_WIDTH
.loop3
ld [hli], a
@@ -445,9 +445,9 @@ PadMapForHDMATransfer:
dec c
jr nz, .loop1
-; restore the original value of hMapObjectIndexBuffer
+; restore the original value of hMapObjectIndex
pop af
- ldh [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndex], a
ret
HDMATransfer2bpp::
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index 847eb07f7..f911abad1 100644
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -51,7 +51,7 @@ Unused_GetPartyMenuMonIcon:
.GetPartyMonItemGFX:
push bc
- ldh a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndex]
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -125,7 +125,7 @@ PartyMenu_InitAnimatedMonIcon:
.SpawnItemIcon:
push bc
- ldh a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndex]
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -154,7 +154,7 @@ PartyMenu_InitAnimatedMonIcon:
InitPartyMenuIcon:
ld a, [wCurIconTile]
push af
- ldh a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndex]
ld hl, wPartySpecies
ld e, a
ld d, 0
@@ -163,7 +163,7 @@ InitPartyMenuIcon:
call ReadMonMenuIcon
ld [wCurIcon], a
call GetMemIconGFX
- ldh a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndex]
; y coord
add a
add a
@@ -184,7 +184,7 @@ InitPartyMenuIcon:
SetPartyMonIconAnimSpeed:
push bc
- ldh a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndex]
ld b, a
call .getspeed
ld a, b