diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /include/sprite.h | |
parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) |
I hope this fixes merge conflicts
Diffstat (limited to 'include/sprite.h')
-rw-r--r-- | include/sprite.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sprite.h b/include/sprite.h index 7b3c9fb5a..838b0d7c0 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -240,6 +240,8 @@ struct OamMatrix extern const struct OamData gDummyOamData; extern const union AnimCmd *const gDummySpriteAnimTable[]; extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; +extern s16 gSpriteCoordOffsetX; +extern s16 gSpriteCoordOffsetY; extern struct Sprite gSprites[]; |