summaryrefslogtreecommitdiff
path: root/home/vcopy.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-04-17 21:00:28 -0500
committerdannye <33dannye@gmail.com>2021-04-17 21:00:28 -0500
commitd4154b289176647ff20e19879de70073bd6d9a30 (patch)
treef4175a9303dd0e1430f4c42e79a4d5ffb1f32c00 /home/vcopy.asm
parenta1081856200cec52ba881fc6f878f5ce0328ab0a (diff)
parent2fdcb1a3d6919f378b2f83f14d3b3822a19fcc33 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home/vcopy.asm')
-rw-r--r--home/vcopy.asm22
1 files changed, 9 insertions, 13 deletions
diff --git a/home/vcopy.asm b/home/vcopy.asm
index 2b68eb09..4a80d261 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -23,7 +23,7 @@ ClearBgMap::
jr .next
ld a, l
.next
- ld de, $400 ; size of VRAM background map
+ ld de, BG_MAP_WIDTH * BG_MAP_HEIGHT
ld l, e
.loop
ld [hli], a
@@ -69,7 +69,7 @@ RedrawRowOrColumn::
.noCarry
; the following 4 lines wrap us from bottom to top if necessary
ld a, d
- and $03
+ and $3
or $98
ld d, a
dec c
@@ -165,21 +165,19 @@ AutoBgMapTransfer::
TransferBgRows::
; unrolled loop and using pop for speed
-
- REPT 20 / 2 - 1
+REPT SCREEN_WIDTH / 2 - 1
pop de
ld [hl], e
inc l
ld [hl], d
inc l
- ENDR
-
+ENDR
pop de
ld [hl], e
inc l
ld [hl], d
- ld a, 32 - (20 - 1)
+ ld a, BG_MAP_WIDTH - (SCREEN_WIDTH - 1)
add l
ld l, a
jr nc, .ok
@@ -249,7 +247,7 @@ VBlankCopyDouble::
ldh [hVBlankCopyDoubleSize], a
.loop
- REPT 3
+REPT LEN_2BPP_TILE / 4 - 1
pop de
ld [hl], e
inc l
@@ -259,8 +257,7 @@ VBlankCopyDouble::
inc l
ld [hl], d
inc l
- ENDR
-
+ENDR
pop de
ld [hl], e
inc l
@@ -316,14 +313,13 @@ VBlankCopy::
ldh [hVBlankCopySize], a
.loop
- REPT 7
+REPT LEN_2BPP_TILE / 2 - 1
pop de
ld [hl], e
inc l
ld [hl], d
inc l
- ENDR
-
+ENDR
pop de
ld [hl], e
inc l