From 8a79315635ee9ebb6eed5c9648fe89746085d0b1 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 6 Jul 2020 12:28:31 -0400 Subject: Capitalize rgbds control structures (EQU/EQUS, IF/ELIF/ELSE/ENDC, REPT/ENDR, MACRO/ENDM, etc) --- macros/data.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'macros/data.asm') diff --git a/macros/data.asm b/macros/data.asm index 333bf937..7a813529 100755 --- a/macros/data.asm +++ b/macros/data.asm @@ -13,40 +13,40 @@ bcd3: MACRO dn ((\1) / 10) % 10, (\1) % 10 ENDM -coins equs "bcd2" -money equs "bcd3" +coins EQUS "bcd2" +money EQUS "bcd3" tmhm: MACRO ; used in data/pokemon/base_stats/*.asm _tms1 = 0 ; TM01-TM24 (24) _tms2 = 0 ; TM25-TM48 (24) _tms3 = 0 ; TM49-TM50 + HM01-HM05 (7/24) -rept _NARG +REPT _NARG if DEF(\1_TMNUM) if \1_TMNUM < 24 + 1 _tms1 = _tms1 | (1 << ((\1_TMNUM) - 1)) - elif \1_TMNUM < 48 + 1 + ELIF \1_TMNUM < 48 + 1 _tms2 = _tms2 | (1 << ((\1_TMNUM) - 1 - 24)) else _tms3 = _tms3 | (1 << ((\1_TMNUM) - 1 - 48)) - endc + ENDC else fail "\1 is not a TM or HM move" - endc + ENDC shift -endr -rept 3 ; TM01-TM24 (24/24) +ENDR +REPT 3 ; TM01-TM24 (24/24) db _tms1 & $ff _tms1 = _tms1 >> 8 -endr -rept 3 ; TM25-TM48 (24/24) +ENDR +REPT 3 ; TM25-TM48 (24/24) db _tms2 & $ff _tms2 = _tms2 >> 8 -endr -rept 1 ; TM49-TM50 + HM01-HM05 (7/8) +ENDR +REPT 1 ; TM49-TM50 + HM01-HM05 (7/8) db _tms3 & $ff _tms3 = _tms3 >> 8 -endr +ENDR ENDM -- cgit v1.3.1-sl0p