diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 46 | ||||
| -rw-r--r-- | include/sprite.h | 9 |
2 files changed, 55 insertions, 0 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index fcb430816..6484bd6c2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,7 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H +#include "battle.h" #include "constants/battle_anim.h" enum @@ -128,4 +129,49 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); u8 GetBattlerSpriteFinal_Y(u8, u16, u8); +extern const struct OamData gUnknown_08524944; +extern const struct OamData gUnknown_08524A8C; +extern const struct OamData gUnknown_08524904; +extern const struct OamData gUnknown_085249C4; +extern const struct OamData gUnknown_0852490C; +extern const struct OamData gUnknown_08524934; +extern const struct OamData gUnknown_08524974; +extern const struct OamData gUnknown_0852499C; +extern const struct OamData gUnknown_085249CC; +extern const struct OamData gUnknown_08524914; +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_08524954; +extern const struct OamData gUnknown_08524AE4; +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; +extern const struct OamData gUnknown_08524B24; +extern const struct OamData gUnknown_08524A24; +extern const struct OamData gUnknown_08524AC4; +extern const struct OamData gUnknown_08524A84; +extern const struct OamData gUnknown_08524A64; +extern const struct OamData gUnknown_0852491C; +extern const struct OamData gUnknown_0852495C; +extern const struct OamData gUnknown_0852497C; +extern const struct OamData gUnknown_085249F4; +extern const struct OamData gUnknown_0852493C; +extern const struct OamData gUnknown_08524A5C; +extern const struct OamData gUnknown_08524A74; + #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 { |