diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /include/sprite.h | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'include/sprite.h')
| -rw-r--r-- | include/sprite.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/sprite.h b/include/sprite.h index 3ad418356..9a5deb3c4 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -100,12 +100,19 @@ struct AffineAnimJumpCmd u16 target; }; +struct AffineAnimEndCmdAlt +{ + s16 type; + u16 val; +}; + union AffineAnimCmd { s16 type; struct AffineAnimFrameCmd frame; struct AffineAnimLoopCmd loop; struct AffineAnimJumpCmd jump; + struct AffineAnimEndCmdAlt end; // unused in code }; #define AFFINEANIMCMDTYPE_LOOP 0x7FFD @@ -120,6 +127,8 @@ union AffineAnimCmd {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} +#define AFFINEANIMCMD_END_ALT(_val) \ + {.end = {.type = AFFINEANIMCMDTYPE_END, .val = _val}} struct AffineAnimState { |