Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt `tmhm` for consistency 

Using an underscore before macro variables avoids cluttering up the
global namespace. While this isn't much of a problem right now, it's
good practice that'll keep us from problems in the future.
This commit is contained in:
mid-kid 2018-11-11 00:50:53 +01:00
parent 056cd5e871
commit b92b91df17
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
data/pokemon/base_stats.asm
View File

@ -1,16 +1,16 @@
tmhm: MACRO tmhm: MACRO
; used in data/pokemon/base_stats/*.asm ; used in data/pokemon/base_stats/*.asm
tms1 = 0 ; TM01-TM24 (24) _tms1 = 0 ; TM01-TM24 (24)
tms2 = 0 ; TM25-TM48 (24) _tms2 = 0 ; TM25-TM48 (24)
tms3 = 0 ; TM49-TM50 + HM01-HM07 + MT01-MT03 (12/24) _tms3 = 0 ; TM49-TM50 + HM01-HM07 + MT01-MT03 (12/24)
rept _NARG rept _NARG
if DEF(\1_TMNUM) if DEF(\1_TMNUM)
if \1_TMNUM < 24 + 1 if \1_TMNUM < 24 + 1
tms1 = tms1 | (1 << ((\1_TMNUM) - 1)) _tms1 = _tms1 | (1 << ((\1_TMNUM) - 1))
elif \1_TMNUM < 48 + 1 elif \1_TMNUM < 48 + 1
tms2 = tms2 | (1 << ((\1_TMNUM) - 1 - 24)) _tms2 = _tms2 | (1 << ((\1_TMNUM) - 1 - 24))
else else
tms3 = tms3 | (1 << ((\1_TMNUM) - 1 - 48)) _tms3 = _tms3 | (1 << ((\1_TMNUM) - 1 - 48))
endc endc
else else
fail "\1 is not a TM, HM, or move tutor move" fail "\1 is not a TM, HM, or move tutor move"
@ -18,16 +18,16 @@ tms3 = tms3 | (1 << ((\1_TMNUM) - 1 - 48))
shift shift
endr endr
rept 3 ; TM01-TM24 (24/24) rept 3 ; TM01-TM24 (24/24)
db tms1 & $ff db _tms1 & $ff
tms1 = tms1 >> 8 _tms1 = _tms1 >> 8
endr endr
rept 3 ; TM25-TM48 (24/24) rept 3 ; TM25-TM48 (24/24)
db tms2 & $ff db _tms2 & $ff
tms2 = tms2 >> 8 _tms2 = _tms2 >> 8
endr endr
rept 2 ; TM49-TM50 + HM01-HM07 + MT01-MT03 (12/16) rept 2 ; TM49-TM50 + HM01-HM07 + MT01-MT03 (12/16)
db tms3 & $ff db _tms3 & $ff
tms3 = tms3 >> 8 _tms3 = _tms3 >> 8
endr endr
ENDM ENDM