diff options
| author | YamaArashi <shadow962@live.com> | 2016-05-17 04:43:13 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-05-17 04:43:13 -0700 |
| commit | 4bed639c290cbeee0b1d6e18cb333510afa84e13 (patch) | |
| tree | e6755e3cd292e1b526d4356d427aec120cf7647f /asm/macros | |
| parent | 7acc54c6bc00a248399ac14cc3abcf8db6d7c797 (diff) | |
pokedex data
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/pokemon_data.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.s index 122392163..f18462d34 100644 --- a/asm/macros/pokemon_data.s +++ b/asm/macros/pokemon_data.s @@ -1,8 +1,8 @@ - .macro pokedex_entry category_name, height, width, text_pointer, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset - .charmapstr "\category_name", 12 + .macro pokedex_entry pokemon_name, height, width, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset .2byte \height @ in decimeters .2byte \width @ in hectograms - .4byte \text_pointer + .4byte DexDescription_\pokemon_name\()_1 + .4byte DexDescription_\pokemon_name\()_2 .2byte 0 @ unused .2byte \pokemon_scale .2byte \pokemon_offset |