aboutsummaryrefslogtreecommitdiffstats
path: root/macros/data.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2022-06-06 16:25:31 -0500
committerGitHub <noreply@github.com>2022-06-06 17:25:31 -0400
commit6b5be9129cabe72b9f775b02db1bf7e7169153da (patch)
treed92012450c70f90bf8086bed32ec3dc87b68b332 /macros/data.asm
parentImproved Virtual Console patch identifiers (#357) (diff)
downloadpokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz
pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'macros/data.asm')
-rw-r--r--macros/data.asm78
1 files changed, 39 insertions, 39 deletions
diff --git a/macros/data.asm b/macros/data.asm
index 1f3c87a0..5092b74e 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -1,71 +1,71 @@
; Value macros
-percent EQUS "* $ff / 100"
+DEF percent EQUS "* $ff / 100"
-bcd2: MACRO
+MACRO bcd2
dn ((\1) / 1000) % 10, ((\1) / 100) % 10
dn ((\1) / 10) % 10, (\1) % 10
ENDM
-bcd3: MACRO
+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
-tmhm: MACRO
+MACRO tmhm
; initialize bytes to 0
-FOR n, (NUM_TM_HM + 7) / 8
-_tm{d:n} = 0
-ENDR
-; set bits of bytes
-REPT _NARG
- IF DEF(\1_TMNUM)
-n = (\1_TMNUM - 1) / 8
-i = (\1_TMNUM - 1) % 8
-_tm{d:n} |= 1 << i
- ELSE
- FAIL "\1 is not a TM or HM move"
- ENDC
- SHIFT
-ENDR
-; output bytes
-FOR n, (NUM_TM_HM + 7) / 8
- db _tm{d:n}
-ENDR
+ FOR n, (NUM_TM_HM + 7) / 8
+ DEF _tm{d:n} = 0
+ ENDR
+ ; set bits of bytes
+ REPT _NARG
+ IF DEF(\1_TMNUM)
+ DEF n = (\1_TMNUM - 1) / 8
+ DEF i = (\1_TMNUM - 1) % 8
+ DEF _tm{d:n} |= 1 << i
+ ELSE
+ FAIL "\1 is not a TM or HM move"
+ ENDC
+ SHIFT
+ ENDR
+ ; output bytes
+ FOR n, (NUM_TM_HM + 7) / 8
+ db _tm{d:n}
+ ENDR
ENDM
; Constant data (db, dw, dl) macros
-dbw: MACRO
+MACRO dbw
db \1
dw \2
ENDM
-dwb: MACRO
+MACRO dwb
dw \1
db \2
ENDM
-dn: MACRO ; nybbles
-REPT _NARG / 2
- db ((\1) << 4) | (\2)
- SHIFT 2
-ENDR
+MACRO dn ; nybbles
+ REPT _NARG / 2
+ db ((\1) << 4) | (\2)
+ SHIFT 2
+ ENDR
ENDM
-dba: MACRO ; dbw bank, address
-REPT _NARG
- dbw BANK(\1), \1
- SHIFT
-ENDR
+MACRO dba ; dbw bank, address
+ REPT _NARG
+ dbw BANK(\1), \1
+ SHIFT
+ ENDR
ENDM
-dab: MACRO ; dwb address, bank
-REPT _NARG
- dwb \1, BANK(\1)
- SHIFT
-ENDR
+MACRO dab ; dwb address, bank
+ REPT _NARG
+ dwb \1, BANK(\1)
+ SHIFT
+ ENDR
ENDM