summaryrefslogtreecommitdiff
path: root/macros/code.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-27 03:33:13 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-27 03:35:35 -0400
commit70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch)
tree202f65e4131709331ae62cbe5eace4d6f8b6aa58 /macros/code.asm
parent75cf425d30db6a036743cf85c483c1b537063605 (diff)
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'macros/code.asm')
-rw-r--r--macros/code.asm13
1 files changed, 1 insertions, 12 deletions
diff --git a/macros/code.asm b/macros/code.asm
index 9429884c..c92e7132 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -8,17 +8,6 @@ ln: MACRO ; r, hi, lo
ld \1, ((\2) & $f) << 4 | ((\3) & $f)
ENDM
-ldpixel: MACRO
-if _NARG >= 5
- lb \1, \2 * 8 + \4, \3 * 8 + \5
-else
- lb \1, \2 * 8, \3 * 8
-endc
-ENDM
-
-depixel EQUS "ldpixel de,"
-bcpixel EQUS "ldpixel bc,"
-
; Design patterns
jumptable: MACRO
@@ -62,7 +51,7 @@ calc_sine_wave: MACRO
; input: a = a signed 6-bit value
; output: a = d * sin(a * pi/32)
and %111111
- cp %100000
+ cp %100000
jr nc, .negative\@
call .apply\@
ld a, h