diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-30 11:53:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 11:53:05 -0500 |
| commit | 2837859bdb439aafff70ba58749277c0ab3364d4 (patch) | |
| tree | 138d4d47767e36b1ee2f9ee41be336adff8dc9a0 /include/sprite.h | |
| parent | c8ef69a00d303bf0fd57d3a3069b51d58d8c5def (diff) | |
| parent | 678156ff0e570b7b88c8cefaa2a44cd9e724cf64 (diff) | |
Merge pull request #373 from garakmon/battle-anim
Split battle_anim_80FE840 and move data to C
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 { |