diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-18 19:18:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 19:18:44 -0500 |
| commit | 442baf1a00d9dc06b9d8175a66b70fe159b3aa3f (patch) | |
| tree | 9e908648f10c5b3891949815d94508d0b14dfade /include/sprite.h | |
| parent | b23dc9a12303e979b7612c703f706cbe2b091c96 (diff) | |
| parent | dfee5deca8e5c6f5b35b75d56e215638b66320b0 (diff) | |
Merge pull request #367 from DizzyEggg/move_blitmap
Move Bitmap struct and clear sprite/text files a bit
Diffstat (limited to 'include/sprite.h')
| -rw-r--r-- | include/sprite.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/sprite.h b/include/sprite.h index 8fc45d501..4ffcd2884 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -235,11 +235,15 @@ extern const struct OamData gDummyOamData; extern const union AnimCmd *const gDummySpriteAnimTable[]; extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; extern const struct SpriteTemplate gDummySpriteTemplate; -extern s16 gSpriteCoordOffsetX; -extern s16 gSpriteCoordOffsetY; +extern u8 gReservedSpritePaletteCount; extern struct Sprite gSprites[]; +extern u8 gOamLimit; +extern u16 gReservedSpriteTileCount; +extern s16 gSpriteCoordOffsetX; +extern s16 gSpriteCoordOffsetY; extern struct OamMatrix gOamMatrices[]; +extern bool8 gAffineAnimsDisabled; void ResetSpriteData(void); void AnimateSprites(void); |