diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:06 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:06 -0400 |
commit | 175d4724a33bbb34e1a5ee609584a45ab9685058 (patch) | |
tree | 976418c3f6efec04593d9dd3e7f3e8ca09869713 /include/sprite.h | |
parent | 71f813e6e21e6ad5ec84b497cbb123b521979b92 (diff) | |
parent | 8ef6c0004cc1093e1533eb2d41fbde71ee93d22c (diff) |
Merge branch 'decoration'
Diffstat (limited to 'include/sprite.h')
-rwxr-xr-x[-rw-r--r--] | include/sprite.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sprite.h b/include/sprite.h index bda635885..13c03ab51 100644..100755 --- a/include/sprite.h +++ b/include/sprite.h @@ -16,6 +16,8 @@ struct SpriteFrameImage u16 size; }; +#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} + struct SpritePalette { const u16 *data; @@ -142,7 +144,7 @@ struct SpriteTemplate u16 paletteTag; const struct OamData *oam; const union AnimCmd *const *anims; - struct SpriteFrameImage *images; + const struct SpriteFrameImage *images; const union AffineAnimCmd *const *affineAnims; void (*callback)(struct Sprite *); }; |