diff options
author | Evan <eroelke@gmail.com> | 2019-12-02 20:58:12 -0700 |
---|---|---|
committer | Evan <eroelke@gmail.com> | 2019-12-04 14:54:52 -0700 |
commit | f1bd7a41cc1e2bcd730a0c2c6c5c4c618044f631 (patch) | |
tree | d1292eeef6904b3a5f032bc5494fbc65f68915d6 /include/battle_anim.h | |
parent | 5c40e5ea212c947b1853a8c8dc23dcb8d882bf90 (diff) |
resolve compiler errors
Diffstat (limited to 'include/battle_anim.h')
-rw-r--r-- | include/battle_anim.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 6002cd5ee..60245ee55 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -197,8 +197,12 @@ void sub_80BCEF4(s32 bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *ar // battle_anim_special.s void sub_80F1720(u8 battler, struct Pokemon *mon); -// battle_anim_effects_1.s -void AnimMoveTwisterParticle(struct Sprite *sprite); +// battle_anim_effects_1.c +void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite); +void AnimMoveTwisterParticle(struct Sprite* sprite); + +// water.c +void AnimWaterPulseRing(struct Sprite *sprite); enum { @@ -284,7 +288,7 @@ void sub_8075358(u32 bgId); void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset); void InitAnimBgTilemapBuffer(u32 bgId, const void *src); void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src); -u8 sub_8075454(void); +u8 GetBattleBgPaletteNum(void); void sub_8075458(bool8 arg0); void sub_8075490(struct Sprite *sprite); void InitSpriteDataForLinearTranslation(struct Sprite *sprite); @@ -451,6 +455,9 @@ void sub_80AD800(u8 taskId); extern const union AnimCmd *const gUnknown_83E5958[]; extern const union AnimCmd *const gUnknown_83E5A78[]; +// smokescreen.c +u8 SmokescreenImpact(s16 x, s16 y, u8 a3); + // battle_anim_utility_funcs.c void sub_80BA7F8(u8 taskId); void sub_80BA83C(u8 taskId); |