diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 19 | ||||
| -rw-r--r-- | include/sprite.h | 9 |
2 files changed, 24 insertions, 4 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index c7884aa18..61659c350 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -143,12 +143,23 @@ extern const struct OamData gUnknown_0852496C; extern const struct OamData gUnknown_08524A34; extern const struct OamData gUnknown_08524A3C; extern const struct OamData gUnknown_08524A94; -extern const struct OamData gUnknown_0852490C; -extern const struct OamData gUnknown_08524974; extern const struct OamData gUnknown_08524954; extern const struct OamData gUnknown_08524AE4; -extern const struct OamData gUnknown_08524914; -extern const struct OamData gUnknown_085249CC; extern const struct OamData gUnknown_085249D4; +extern const struct OamData gUnknown_08524A9C; +extern const struct OamData gUnknown_08524ADC; +extern const struct OamData gUnknown_08524B14; +extern const struct OamData gUnknown_08524A54; +extern const struct OamData gUnknown_08524A14; +extern const struct OamData gUnknown_08524A1C; +extern const struct OamData gUnknown_085249BC; +extern const struct OamData gUnknown_08524AF4; +extern const struct OamData gUnknown_085249DC; +extern const struct OamData gUnknown_08524AFC; +extern const struct OamData gUnknown_08524B1C; +extern const struct OamData gUnknown_08524A04; +extern const struct OamData gUnknown_08524A2C; +extern const struct OamData gUnknown_08524AEC; +extern const struct OamData gUnknown_08524964; #endif // GUARD_BATTLE_ANIM_H 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 { |