diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-06 13:47:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 13:47:59 -0400 |
| commit | c480632d5494d04f7f5f0298a31877a2293b564e (patch) | |
| tree | 02483fc07e60d64a4b526ce8b402f26960ad33b2 /macros/data.asm | |
| parent | 122d715484b79aba71d79caf148bac4a2ec441a5 (diff) | |
| parent | 9c2be80bf3fbdac6505787b00da0f4ff71839a05 (diff) | |
Merge pull request #262 from Rangi42/master
Miscellaneous
Diffstat (limited to 'macros/data.asm')
| -rwxr-xr-x | macros/data.asm | 26 |
1 files changed, 13 insertions, 13 deletions
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 |