diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
| commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
| tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /include/sprite.h | |
| parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge with master and fix 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[]; |