aboutsummaryrefslogtreecommitdiffstats
path: root/macros/data.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-04-17 21:00:28 -0500
committerdannye <33dannye@gmail.com>2021-04-17 21:00:28 -0500
commitd4154b289176647ff20e19879de70073bd6d9a30 (patch)
treef4175a9303dd0e1430f4c42e79a4d5ffb1f32c00 /macros/data.asm
parentMerge remote-tracking branch 'remotes/pokered/master' (diff)
parentPrevent some gcc versions from complaining about {0} in tools/scan_includes.c (diff)
downloadpokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.tar.gz
pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.tar.xz
pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'macros/data.asm')
-rw-r--r--macros/data.asm20
1 files changed, 5 insertions, 15 deletions
diff --git a/macros/data.asm b/macros/data.asm
index 486d23a6..f9274392 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -19,33 +19,23 @@ money EQUS "bcd3"
; used in data/pokemon/base_stats/*.asm
tmhm: MACRO
; initialize bytes to 0
-n = 0
-REPT (NUM_TM_HM + 7) / 8
-_TM_BYTE EQUS "_tm{d:n}"
-_TM_BYTE = 0
-PURGE _TM_BYTE
-n = n + 1
+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_BYTE EQUS "_tm{d:n}"
-_TM_BYTE = _TM_BYTE | (1 << i)
-PURGE _TM_BYTE
+_tm{d:n} = _tm{d:n} | (1 << i)
ELSE
FAIL "\1 is not a TM or HM move"
ENDC
SHIFT
ENDR
; output bytes
-n = 0
-REPT (NUM_TM_HM + 7) / 8
-_TM_BYTE EQUS "_tm{d:n}"
- db _TM_BYTE
-PURGE _TM_BYTE
-n = n + 1
+FOR n, (NUM_TM_HM + 7) / 8
+ db _tm{d:n}
ENDR
ENDM