diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-29 12:52:21 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-29 12:52:21 -0700 |
| commit | c88cf196af0f099f4daa7cbc06b9b0df9a31c60c (patch) | |
| tree | f90fb1f81857964a3bd24962a13573c7c74ca921 /include | |
| parent | db5067c512a33ef913bb3e2d4cbef589d32a48a6 (diff) | |
Move another chunk of battle anim .rodata
Diffstat (limited to 'include')
| -rw-r--r-- | include/rom_8077ABC.h | 1 | ||||
| -rw-r--r-- | include/sprite.h | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 7215e7fb3..f1e8cbde4 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -106,5 +106,6 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void sub_80789D4(bool8 a1); void sub_8079AB8(u8 sprite, u8 sprite2); u8 sub_807A4A0(int bank, u8 sprite, int species); +void sub_80794A8(struct Sprite *sprite); #endif // GUARD_ROM_8077ABC_H 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 { |