diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
| commit | 2c254082de042dde46cee9d2da2d9bb1bc340905 (patch) | |
| tree | af99bcac2c6fece9523b12dbabe4128ec26f6fc9 /asm/macros.inc | |
| parent | 78558b07b0983b6b8b06085933fdf66b801658e9 (diff) | |
| parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'asm/macros.inc')
| -rw-r--r-- | asm/macros.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/asm/macros.inc b/asm/macros.inc index e6813d319..4eae2cccc 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -65,10 +65,9 @@ .endm .macro subsprite x, y, priority, tile_num_offset, size - .2byte \x - .2byte \y + .byte \x + .byte \y .2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size - .2byte 0 @ padding .endm .macro obj_image_anim_frame pic_id, duration, flags = 0 |