diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:41:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:46:04 -0400 |
| commit | b8fec3d9f617ec9a764bb56804c526ff7449631f (patch) | |
| tree | 2e84d0bf6107a15ebcb94a23c3158e2bc6382f6f /include/sprite.h | |
| parent | 9fe74ac590f75a0571de8ebcd499fdf892419328 (diff) | |
| parent | 8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (diff) | |
Merge branch 'master' into trade
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 27e5dc852..85722311f 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -116,6 +116,7 @@ union AffineAnimCmd struct AffineAnimFrameCmd frame; struct AffineAnimLoopCmd loop; struct AffineAnimJumpCmd jump; + struct AffineAnimEndCmdAlt end; }; #define AFFINEANIMCMDTYPE_LOOP 0x7FFD @@ -251,6 +252,7 @@ extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetY; extern const struct SpriteTemplate gDummySpriteTemplate; extern struct Sprite gSprites[]; +extern struct OamMatrix gOamMatrices[]; void ResetSpriteData(void); void AnimateSprites(void); |