summaryrefslogtreecommitdiff
path: root/macros/code.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-05-11 00:45:12 -0400
committerGitHub <noreply@github.com>2018-05-11 00:45:12 -0400
commit53bcd8f46ca4f78381af70f55d03f3180be277de (patch)
tree710b0e1183eb484785b144adcf3e9279b91af66f /macros/code.asm
parent9b0ca7b8c2a6ef6e3b6ef1f591f0ec875432b03a (diff)
parent47379235f875a3bd07b969ea554b82052191daf9 (diff)
Merge pull request #512 from pret/warnings
fix lb/ln and "left shift of negative value" warning
Diffstat (limited to 'macros/code.asm')
-rw-r--r--macros/code.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros/code.asm b/macros/code.asm
index a02a33380..1fb651f30 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -1,11 +1,11 @@
; Syntactic sugar macros
lb: MACRO ; r, hi, lo
- ld \1, (\2 & $ff) << 8 + (\3 & $ff)
+ ld \1, (((\2) & $ff) << 8) | (((\3) & $ff))
ENDM
ln: MACRO ; r, hi, lo
- ld \1, (\2 & $f) << 4 + (\3 & $f)
+ ld \1, (((\2) & $f) << 4) | (((\3) & $f))
ENDM
ldpixel: MACRO