diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-30 21:48:18 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-30 21:48:18 +0100 |
| commit | 90ef2694266a13ae9642c4cea4e4125df1e3fae8 (patch) | |
| tree | b3abdb68f7b78ee91f54dbbee8772349287ae606 /include/sprite.h | |
| parent | 0da7d7e6ae7cb50ca0b52d1ea27d98e3f02e50d2 (diff) | |
| parent | 9adbb5d8719db5e60f0051b5a854deec09ae5860 (diff) | |
Merge branch 'master' into battle_frontier_2
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 085faff68..32bdd9c55 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -103,12 +103,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 @@ -123,6 +130,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 { |