diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-30 13:42:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 13:42:55 -0700 |
| commit | 74f9ec9464e5346ae277c9c929ef4b965276fc02 (patch) | |
| tree | 6e12c5e3f456ad444d37853f0bb8e0a03bd85003 /include/sprite.h | |
| parent | e437b10eee6f843e1898ce9b0302afb17f8b81e9 (diff) | |
| parent | d68e8b09eecd136fc0dcc32c1e08b946b8981adc (diff) | |
Merge pull request #608 from huderlem/anim_rodata
Move battle anim .rodata
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 { |