From f2ae74079fc917cbf7e1f640eb8beda0d4740887 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 23 Jan 2018 16:45:34 -0500
Subject: Prefix wram labels with w, part 1.

Handle edge cases first.
---
 macros/wram.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'macros')

diff --git a/macros/wram.asm b/macros/wram.asm
index 47138e40c..7c8ca44a1 100755
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -129,7 +129,7 @@ map_connection_struct: MACRO
 ENDM
 
 channel_struct: MACRO
-; Addreses are Channel1 (c101).
+; Addreses are wChannel1 (c101).
 \1MusicID::           dw
 \1MusicBank::         db
 \1Flags::             db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
-- 
cgit v1.2.3


From a1951cefc09035e11077a433b28ec8c66b3b03db Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 23 Jan 2018 17:39:09 -0500
Subject: Prefix wram labels with w, part 2.

---
 macros/coords.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'macros')

diff --git a/macros/coords.asm b/macros/coords.asm
index a66fc6b29..95c4cb041 100644
--- a/macros/coords.asm
+++ b/macros/coords.asm
@@ -5,7 +5,7 @@ decoord EQUS "coord de,"
 coord: MACRO
 ; register, x, y[, origin]
 	if _NARG < 4
-	ld \1, (\3) * SCREEN_WIDTH + (\2) + TileMap
+	ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap
 	else
 	ld \1, (\3) * SCREEN_WIDTH + (\2) + \4
 	endc
@@ -27,7 +27,7 @@ ENDM
 dwcoord: MACRO
 ; x, y
 	rept _NARG / 2
-	dw (\2) * SCREEN_WIDTH + (\1) + TileMap
+	dw (\2) * SCREEN_WIDTH + (\1) + wTileMap
 	shift
 	shift
 	endr
@@ -36,7 +36,7 @@ ENDM
 ldcoord_a: MACRO
 ; x, y[, origin]
 	if _NARG < 3
-	ld [(\2) * SCREEN_WIDTH + (\1) + TileMap], a
+	ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a
 	else
 	ld [(\2) * SCREEN_WIDTH + (\1) + \3], a
 	endc
@@ -45,7 +45,7 @@ ENDM
 lda_coord: MACRO
 ; x, y[, origin]
 	if _NARG < 3
-	ld a, [(\2) * SCREEN_WIDTH + (\1) + TileMap]
+	ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap]
 	else
 	ld a, [(\2) * SCREEN_WIDTH + (\1) + \3]
 	endc
-- 
cgit v1.2.3