diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 00:37:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 00:37:08 -0400 |
| commit | 93d17ef7c886b96791931ba50406b59756e1bdbd (patch) | |
| tree | a96f8cc5e480114dadd1362372da0606c26bc928 /include/battle_anim.h | |
| parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' into doc-rm
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index f568d0f97..c8704707b 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -412,9 +412,9 @@ void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 x void sub_8075AD8(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor); -u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7); -u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4); -u8 sub_8075D80(u8 a1); +u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7); +u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight); +u8 GetSpritePalIdxByBattler(u8 a1); void AnimSpriteOnMonPos(struct Sprite *sprite); void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void AnimThrowProjectile(struct Sprite *sprite); @@ -468,7 +468,7 @@ void sub_8099BD4(u8 taskId); extern const struct SpriteTemplate gUnknown_83E7C98; extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; u32 UnpackSelectedBattleAnimPalettes(s16 selector); -void sub_80B9BDC(u8 taskId); +void AnimTask_CurseBlendEffect(u8 taskId); void sub_80B9CE4(u8 taskId); void sub_80B9E58(u8 taskId); void sub_80B9F6C(u8 taskId); @@ -561,13 +561,13 @@ void AnimWaterPulseRing(struct Sprite *sprite); u8 SmokescreenImpact(s16 x, s16 y, u8 a3); // battle_anim_utility_funcs.c -void sub_80BA7F8(u8 taskId); -void sub_80BA83C(u8 taskId); +void AnimTask_BlendSelected(u8 taskId); +void AnimTask_BlendExcept(u8 taskId); void AnimTask_SetCamouflageBlend(u8 taskId); void AnimTask_BlendParticle(u8 taskId); -void sub_80BAB38(u8 taskId); -void sub_80BAB98(u8 taskId); -void sub_80BACEC(u8 taskId); +void AnimTask_HardwarePaletteFade(u8 taskId); +void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId); +void AnimTask_SetUpCurseBackground(u8 taskId); void sub_80BB088(u8 taskId); void sub_80BB660(u8 taskId); void sub_80BB7DC(u8 taskId); |