diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-06-01 09:02:24 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-06-01 09:02:24 +0200 |
| commit | 761edc7db37df18a6e7f41e0d3bb9edd1e3cf721 (patch) | |
| tree | ae116b7a1e65bf0b7c0cc4e574a5655a074e8e7a /macros/code.asm | |
| parent | 8d10a987a375a93045659422779c30d25d1aa89b (diff) | |
| parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'macros/code.asm')
| -rw-r--r-- | macros/code.asm | 4 |
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 |