summaryrefslogtreecommitdiff
path: root/include/sprite.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-12 21:08:06 -0400
committerGitHub <noreply@github.com>2019-10-12 21:08:06 -0400
commit807e03c25d6acd9e5c2bf5337a078b2dfb90f4d9 (patch)
treef834927206547939d8ed4ee9e62e050ff6c8f4f9 /include/sprite.h
parentc52ba041cb793fc3154ab4244796fd5814bfbf18 (diff)
parentff795fa8347f111163ef033a4ae132a3a3caf1eb (diff)
Merge pull request #107 from jiangzhengwenjz/battle
battle (2nd take)
Diffstat (limited to 'include/sprite.h')
-rw-r--r--include/sprite.h2
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);