bgrows → * BG_MAP_WIDTH

No dims macro
This commit is contained in:
Remy Oukaour
2017-12-29 18:59:50 -05:00
parent 586a49c8ad
commit f01434f2c0
3 changed files with 21 additions and 33 deletions

View File

@@ -1,6 +1,3 @@
screenrows EQUS "* SCREEN_WIDTH"
bgrows EQUS "* BG_MAP_WIDTH"
hlcoord EQUS "coord hl,"
bccoord EQUS "coord bc,"
decoord EQUS "coord de,"
@@ -8,9 +5,9 @@ decoord EQUS "coord de,"
coord: MACRO
; register, x, y[, origin]
if _NARG < 4
ld \1, (\3) screenrows + (\2) + TileMap
ld \1, (\3) * SCREEN_WIDTH + (\2) + TileMap
else
ld \1, (\3) screenrows + (\2) + \4
ld \1, (\3) * SCREEN_WIDTH + (\2) + \4
endc
ENDM
@@ -21,25 +18,16 @@ debgcoord EQUS "bgcoord de,"
bgcoord: MACRO
; register, x, y[, origin]
if _NARG < 4
ld \1, (\3) bgrows + (\2) + vBGMap0
ld \1, (\3) * BG_MAP_WIDTH + (\2) + vBGMap0
else
ld \1, (\3) bgrows + (\2) + \4
ld \1, (\3) * BG_MAP_WIDTH + (\2) + \4
endc
ENDM
hldims EQUS "dims hl,"
bcdims EQUS "dims bc,"
dedims EQUS "dims de,"
dims: MACRO
; register, width, height
lb \1, \3, \2
ENDM
dwcoord: MACRO
; x, y
rept _NARG / 2
dw (\2) screenrows + (\1) + TileMap
dw (\2) * SCREEN_WIDTH + (\1) + TileMap
shift
shift
endr
@@ -48,17 +36,17 @@ ENDM
ldcoord_a: MACRO
; x, y[, origin]
if _NARG < 3
ld [(\2) screenrows + (\1) + TileMap], a
ld [(\2) * SCREEN_WIDTH + (\1) + TileMap], a
else
ld [(\2) screenrows + (\1) + \3], a
ld [(\2) * SCREEN_WIDTH + (\1) + \3], a
endc
ENDM
lda_coord: MACRO
; x, y[, origin]
if _NARG < 3
ld a, [(\2) screenrows + (\1) + TileMap]
ld a, [(\2) * SCREEN_WIDTH + (\1) + TileMap]
else
ld a, [(\2) screenrows + (\1) + \3]
ld a, [(\2) * SCREEN_WIDTH + (\1) + \3]
endc
ENDM