diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /include/battle_anim.h | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 54 |
1 files changed, 51 insertions, 3 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 3483f6836..653be10b8 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,9 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H +#include "battle.h" +#include "constants/battle_anim.h" + enum { BG_ANIM_SCREEN_SIZE, @@ -24,9 +27,9 @@ struct UnknownAnimStruct2 struct BattleAnimBackground { - void *image; - void *palette; - void *tilemap; + const u32 *image; + const u32 *palette; + const u32 *tilemap; }; #define ANIM_ARGS_COUNT 8 @@ -126,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 |