diff options
| author | YamaArashi <shadow962@live.com> | 2016-04-21 23:03:41 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-04-21 23:06:36 -0700 |
| commit | 0601fb4d0013bd0f2508364b313acbdc371da674 (patch) | |
| tree | 8d11fa93697da09a4e0eb84bb0957d4722f5c8f4 /asm/macros/pokemon_data.s | |
| parent | 8890ea36eef541ba571df102c3353ee411033261 (diff) | |
Prepare for switch to standard gas (with preprocessor)
Diffstat (limited to 'asm/macros/pokemon_data.s')
| -rw-r--r-- | asm/macros/pokemon_data.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.s index bbdd07043..122392163 100644 --- a/asm/macros/pokemon_data.s +++ b/asm/macros/pokemon_data.s @@ -1,14 +1,14 @@ .macro pokedex_entry category_name, height, width, text_pointer, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset .charmapstr "\category_name", 12 - .2byte \height ; in decimeters - .2byte \width ; in hectograms + .2byte \height @ in decimeters + .2byte \width @ in hectograms .4byte \text_pointer - .2byte 0 ; unused + .2byte 0 @ unused .2byte \pokemon_scale .2byte \pokemon_offset .2byte \trainer_scale .2byte \trainer_offset - .2byte 0 ; padding + .2byte 0 @ padding .endm .macro base_stats hp, attack, defense, speed, sp_attack, sp_defense @@ -32,7 +32,7 @@ .2byte \method .2byte \parameter .2byte \target_species - .2byte 0 ; padding + .2byte 0 @ padding .endm .macro empty_evo_entries count @@ -43,7 +43,7 @@ .2byte 20000 + \species .endm -; If the min level equals the max level, only one level argument is needed. +@ If the min level equals the max level, only one level argument is needed. .macro wild_mon species, min_level, max_level .byte \min_level |