summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-06-05 16:39:42 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-06-05 16:39:42 -0400
commit08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch)
tree7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /macros.asm
parent8cdf73265f95e9a55112f373804867244512878d (diff)
parent2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff)
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
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