diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
commit | 66367c82ef07c10957d45ce7f0f776a178454e18 (patch) | |
tree | 0dd4fcd5cce3ef14dae4fc9ae91e54c6e070eef6 /include/sprite.h | |
parent | 171dd32df8a56e1f10956be8b944cb216edb8f9d (diff) | |
parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) |
Merge remote-tracking branch 'upstream/master' into btl_attrs
Diffstat (limited to 'include/sprite.h')
-rw-r--r-- | include/sprite.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sprite.h b/include/sprite.h index b72c09989..3ad418356 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -235,6 +235,7 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetY; extern u8 gReservedSpritePaletteCount; +extern u16 gReservedSpriteTileCount; extern u8 gOamLimit; |