summaryrefslogtreecommitdiff
path: root/include/sprite.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-12-23 13:39:13 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-12-23 13:39:13 -0500
commit73c16c109cdb996fa59f5aa63e9f030c21cbe54f (patch)
treeb0b4b7eefc77441d711105cf036b273f22ce2ec2 /include/sprite.h
parent56bf99fd9106b3cc8fac45cc051cbeeec40e34aa (diff)
parentaa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff)
Merge branch 'master' into slot_machine
Diffstat (limited to 'include/sprite.h')
-rw-r--r--include/sprite.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/sprite.h b/include/sprite.h
index 7b6dd2bef..1e989b6d5 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -222,12 +222,21 @@ struct Sprite
/*0x43*/ u8 subpriority;
};
+struct OamMatrix
+{
+ s16 a;
+ s16 b;
+ s16 c;
+ s16 d;
+};
+
extern const struct OamData gDummyOamData;
extern const union AnimCmd *const gDummySpriteAnimTable[];
extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
extern s16 gSpriteCoordOffsetX;
extern s16 gSpriteCoordOffsetY;
+extern u8 gReservedSpritePaletteCount;
extern u8 gOamLimit;