summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-02-08 00:03:32 -0800
committeryenatch <yenatch@gmail.com>2015-02-10 00:53:03 -0800
commit8e033210694533bc1233a851d6914e1f0cb90232 (patch)
tree9c526de647aecbdb2dc81da6cb939ffa1d7d707d /macros.asm
parent0683bc87701e6b4c357fb7b21927c17ceb87a6de (diff)
Blindly use wram labels for everything except mobile, part 1.
Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm18
1 files changed, 7 insertions, 11 deletions
diff --git a/macros.asm b/macros.asm
index fadece74e..79f6df03f 100644
--- a/macros.asm
+++ b/macros.asm
@@ -74,20 +74,16 @@ lb: MACRO ; r, hi, lo
ENDM
-bccoord: MACRO
- coord bc, \1, \2
- ENDM
-
-decoord: MACRO
- coord de, \1, \2
- ENDM
-
-hlcoord: MACRO
- coord hl, \1, \2
- ENDM
+bccoord equs "coord bc,"
+decoord equs "coord de,"
+hlcoord equs "coord hl,"
coord: MACRO
+ if _NARG < 4
ld \1, TileMap + SCREEN_WIDTH * (\3) + (\2)
+ else
+ ld \1, \4 + SCREEN_WIDTH * (\3) + (\2)
+ endc
ENDM
dwcoord: MACRO