summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm51
1 files changed, 1 insertions, 50 deletions
diff --git a/macros.asm b/macros.asm
index e8efe5e9..f3070d40 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,5 +1,6 @@
INCLUDE "macros/enum.asm"
INCLUDE "macros/basestats.asm"
+INCLUDE "macros/code.asm"
INCLUDE "macros/scripts/audio.asm"
INCLUDE "macros/scripts/maps.asm"
@@ -102,14 +103,6 @@ dab: MACRO ; dwb address, bank
endr
ENDM
-lb: MACRO ; r, hi, lo
- ld \1, (\2 & $ff) << 8 + (\3 & $ff)
- ENDM
-
-ln: MACRO ; r, hi, lo
- ld \1, (\2 & $f) << 4 + (\3 & $f)
- ENDM
-
bccoord equs "coord bc,"
decoord equs "coord de,"
hlcoord equs "coord hl,"
@@ -235,17 +228,6 @@ ENDM
palettes EQUS "* 8"
-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,"
-
dbpixel: MACRO
if _NARG >= 4
db \1 * 8 + \3, \2 * 8 + \4
@@ -287,37 +269,6 @@ menu_coords: MACRO
db \4, \3 ; end coords
ENDM
-jumptable: MACRO
- ld a, [\2]
- ld e, a
- ld d, 0
- ld hl, \1
- add hl, de
- add hl, de
- ld a, [hli]
- ld h, [hl]
- ld l, a
- jp hl
-endm
-
-maskbits: macro
-; returns to x
-; usage in rejection sampling
-; .loop
-; call Random
-; maskbits 30
-; and x
-; cp 30
-; jr nc, .loop
-
-x = 1
-rept 8
-IF \1 > x
-x = (x + 1) * 2 +- 1
-ENDC
-endr
-endm
-
homecall: MACRO
ld a, [hROMBank]
push af