aboutsummaryrefslogtreecommitdiffstats
path: root/macros/data.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros/data.asm')
-rw-r--r--macros/data.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/macros/data.asm b/macros/data.asm
index 8033f306..86181f8c 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -2,19 +2,19 @@
DEF percent EQUS "* $ff / 100"
-MACRO bcd2
+MACRO? bcd2
dn ((\1) / 1000) % 10, ((\1) / 100) % 10
dn ((\1) / 10) % 10, (\1) % 10
ENDM
-MACRO bcd3
+MACRO? bcd3
dn ((\1) / 100000) % 10, ((\1) / 10000) % 10
dn ((\1) / 1000) % 10, ((\1) / 100) % 10
dn ((\1) / 10) % 10, (\1) % 10
ENDM
; used in data/pokemon/base_stats/*.asm
-MACRO tmhm
+MACRO? tmhm
; initialize bytes to 0
FOR n, (NUM_TM_HM + 7) / 8
DEF _tm{d:n} = 0
@@ -40,49 +40,49 @@ ENDM
; Constant data (db, dw, dl) macros
-MACRO dbw
+MACRO? dbw
db \1
dw \2
ENDM
-MACRO dwb
+MACRO? dwb
dw \1
db \2
ENDM
-MACRO dn ; nybbles
+MACRO? dn ; nybbles
REPT _NARG / 2
db ((\1) << 4) | (\2)
SHIFT 2
ENDR
ENDM
-MACRO dc ; "crumbs"
+MACRO? dc ; "crumbs"
REPT _NARG / 4
db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4)
SHIFT 4
ENDR
ENDM
-MACRO bigdw ; big-endian word
+MACRO? bigdw ; big-endian word
db HIGH(\1), LOW(\1)
ENDM
-MACRO dba ; dbw bank, address
+MACRO? dba ; dbw bank, address
REPT _NARG
dbw BANK(\1), \1
SHIFT
ENDR
ENDM
-MACRO dab ; dwb address, bank
+MACRO? dab ; dwb address, bank
REPT _NARG
dwb \1, BANK(\1)
SHIFT
ENDR
ENDM
-MACRO dname
+MACRO? dname
IF _NARG == 2
DEF n = \2
ELSE
@@ -91,7 +91,7 @@ MACRO dname
ASSERT STRFIND(\1, "@") == -1, "String terminator \"@\" in name: \1"
ASSERT CHARLEN(\1) <= n, "Name longer than {d:n} characters: \1"
db \1
- ds n - CHARLEN(\1), "@"
+ ds n - CHARLEN(\1), '@'
ENDM
MACRO sine_table