summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-04 09:03:51 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-04 09:03:51 -0400
commit7445441edfb298f40cc186976f3721f4e1be81bd (patch)
tree05316f328b328a2231b05970b9233265d9eab6a3 /macros.asm
parent63123f9ad3fa18057811c29c7e3542ebf683d219 (diff)
Pikachu pics; town map entries
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros.asm b/macros.asm
index 6e1ebc9d..b0c38140 100644
--- a/macros.asm
+++ b/macros.asm
@@ -239,7 +239,7 @@ EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer
; nybble: y-coordinate
; nybble: x-coordinate
; word : pointer to map name
- db (\1 + (\2 << 4))
+ dn \2, \1
dw \3
ENDM
@@ -251,7 +251,7 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer
; nybble: x-coordinate
; word : pointer to map name
db \1 + 1
- db \2 + \3 << 4
+ dn \3, \2
dw \4
ENDM