# HG changeset patch
# User Laurens Holst <laurens@grauw.nl>
# Date 1595102687 -7200
#      Sat Jul 18 22:04:47 2020 +0200
# Node ID 6eeb0d2178b35cad574e8be557ae3edeb8a33937
# Parent  dc1de85a47ac32f93b2f466d1013cb520b76e117
MapView: Pass tile in iy rather than ix.

diff --git a/src/MapView.asm b/src/MapView.asm
--- a/src/MapView.asm
+++ b/src/MapView.asm
@@ -247,7 +247,6 @@
 	ld e,0
 	call MapView_GetTile
 	push hl
-	pop ix
 	ld hl,0
 	and a
 	sbc hl,de
@@ -258,11 +257,12 @@
 	ld c,l
 	ld b,h
 	ld a,iyh
+	pop iy
 	rrca
 	rrca
 	ld h,a
 	call DrawTilesBeforeSplit
-	add ix,bc
+	add iy,bc
 	ld a,40H
 	sub h
 	ld h,a
@@ -276,7 +276,7 @@
 ; c' = VDP port 3
 ; de' = tile pixels stride
 ; l' = tile offset
-; ix = tile
+; iy = tile
 DrawTilesBeforeSplit:
 	and ~03H
 	call nz,DrawTiles16
@@ -289,12 +289,12 @@
 ; c' = VDP port 3
 ; de' = tile pixels stride
 ; l' = tile offset
-; ix = tile
+; iy = tile
 DrawTilesAfterSplit: PROC
 	and 03H
 	jr z,Continue
 	call DrawTileA
-	add ix,de
+	add iy,de
 Continue:
 	ld a,h
 	and ~03H
@@ -333,7 +333,7 @@
 	MapView_GetTileSource_M
 	MapView_DrawColumnTile_M 16
 	exx
-	add ix,de
+	add iy,de
 	dec l
 	jp nz,Loop
 	ret
@@ -384,15 +384,15 @@
 	ld c,0
 	call MapView_GetTile
 	push hl
-	pop ix
 	ld de,Tile._size
 	ld bc,-16 * Tile._size
 	ld a,iyl
+	pop iy
 	rrca
 	rrca
 	ld h,a
 	call DrawTilesBeforeSplit
-	add ix,bc
+	add iy,bc
 	ld a,40H
 	sub h
 	ld h,a
@@ -406,7 +406,7 @@
 ; c' = VDP port 3
 ; de' = tile pixels stride
 ; l' = tile offset
-; ix = tile
+; iy = tile
 DrawTilesBeforeSplit:
 	and ~03H
 	call nz,DrawTiles16
@@ -419,12 +419,12 @@
 ; c' = VDP port 3
 ; de' = tile pixels stride
 ; l' = tile offset
-; ix = tile
+; iy = tile
 DrawTilesAfterSplit: PROC
 	and 03H
 	jr z,Continue
 	call DrawTileA
-	add ix,de
+	add iy,de
 Continue:
 	ld a,h
 	and ~03H
@@ -463,25 +463,26 @@
 	MapView_GetTileSource_M
 	MapView_DrawRowTile_M 16
 	exx
-	add ix,de
+	add iy,de
 	dec l
 	jp nz,Loop
 	ret
 	ENDP
 	ENDP
 
-; ix = tile
+; l = tile offset (msb ignored in 4bpp mode)
+; iy = tile
 ; l <- tile offset (msb ignored in 4bpp mode)
 ; hl <- tile pixels
 MapView_GetTileSource_M: MACRO
-	ld a,(ix + Tile.image.bank)
+	ld a,(iy + Tile.image.bank)
 	ld (ROM_mapper.pageA000.BANK_SELECT),a
 	IF Video_4BPU
-	ld h,(ix + Tile.image.address)
+	ld h,(iy + Tile.image.address)
 	add hl,hl
 	rr l
 	ENDIF
-	ld h,(ix + Tile.image.address + 1)
+	ld h,(iy + Tile.image.address + 1)
 	ENDM
 
 ; c = VDP port 3