1 files changed, 7 insertions, 7 deletions
diff --git a/macros.asm b/macros.asm
index 88be4195..1ef09ce7 100644
--- a/macros.asm
+++ b/macros.asm
@@ -129,31 +129,31 @@ hlcoord equs "coord hl,"
 coord: MACRO
 ; register, x, y[, origin]
 	if _NARG < 4
-	ld \1, TileMap + SCREEN_WIDTH * (\3) + (\2)
+	ld \1, wTileMap + SCREEN_WIDTH * (\3) + (\2)
 	else
 	ld \1, \4 + SCREEN_WIDTH * (\3) + (\2)
 	endc
 	ENDM
 
-dwcoord: MACRO
+dwCoord: MACRO
 	rept _NARG / 2
-	dw TileMap + SCREEN_WIDTH * (\2) + (\1)
+	dw wTileMap + SCREEN_WIDTH * (\2) + (\1)
 	shift
 	shift
 	endr
 	ENDM
 
-ldcoord_a: MACRO
+Coorda: MACRO
 	if _NARG < 3
-	ld [TileMap + SCREEN_WIDTH * (\2) + (\1)], a
+	ld [wTileMap + SCREEN_WIDTH * (\2) + (\1)], a
 	else
 	ld [\3 + SCREEN_WIDTH * (\2) + (\1)], a
 	endc
 	ENDM
 
-lda_coord: MACRO
+aCoord: MACRO
 	if _NARG < 3
-	ld a, [TileMap + SCREEN_WIDTH * (\2) + (\1)]
+	ld a, [wTileMap + SCREEN_WIDTH * (\2) + (\1)]
 	else
 	ld a, [\3 + SCREEN_WIDTH * (\2) + (\1)]
 	endc