diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /macros/code.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'macros/code.asm')
| -rw-r--r-- | macros/code.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macros/code.asm b/macros/code.asm index 93b35bd94..5ec214d50 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -2,11 +2,11 @@ lb: MACRO ; r, hi, lo ld \1, (\2 & $ff) << 8 + (\3 & $ff) - ENDM +ENDM ln: MACRO ; r, hi, lo ld \1, (\2 & $f) << 4 + (\3 & $f) - ENDM +ENDM ldpixel: MACRO if _NARG >= 5 @@ -14,7 +14,7 @@ if _NARG >= 5 else lb \1, \2 * 8, \3 * 8 endc - ENDM +ENDM depixel EQUS "ldpixel de," bcpixel EQUS "ldpixel bc," @@ -33,12 +33,12 @@ jumptable: MACRO ld h, [hl] ld l, a jp hl - ENDM +ENDM ; Many mobile functions were dummied out in localization. mobile EQUS "ret" -maskbits: macro +maskbits: MACRO ; example usage in rejection sampling: ; .loop ; call Random @@ -52,4 +52,4 @@ x = (x + 1) * 2 +- 1 endc endr and x - ENDM +ENDM |