diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
commit | d975a85c84616155e226b2d5120aee9adcae16b5 (patch) | |
tree | 0668eb03388e9404e134e24b3dcd753f7bc47050 /include/sprite.h | |
parent | 37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff) | |
parent | 62388f3bfd5b1abd9fa369628b805e683e64c302 (diff) |
Merge remote-tracking branch 'upstream/master' into various_data
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; |