diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-13 22:01:30 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-13 22:01:30 -0400 |
commit | 212bb0566f12c44685e39e3285d4332a88a8feb1 (patch) | |
tree | 169d21413d481de3f18e5509df0b0addc3882dd1 /include/sprite.h | |
parent | 355498d85b71536580025364ccaa5ceb94c4194d (diff) | |
parent | 134cb1c9ec1d1a3a82a88d5065bf0758f9d906a6 (diff) |
Merge branch 'decoration' into decoration_inventory
Diffstat (limited to 'include/sprite.h')
-rwxr-xr-x | include/sprite.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sprite.h b/include/sprite.h index bda635885..13c03ab51 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 *); }; |