diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-07-02 12:53:12 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2021-07-02 12:53:12 -0400 |
| commit | b3d66f5528ccfc8b8a3f6c0d46444ad5943364f4 (patch) | |
| tree | 9917de58912d28e884871cb7efc5b4d291ec4e78 /include/battle_anim.h | |
| parent | 9fd27fe8552eb0716222e72bc92ffa7f7334c68d (diff) | |
| parent | 3964820a84e4819bb807d601d2c3c7b196f764e8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 476480489..ad160e74d 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -143,7 +143,7 @@ void TranslateSpriteLinear(struct Sprite *sprite); void AnimSpriteOnMonPos(struct Sprite *sprite); void InitAnimLinearTranslationWithSpeedAndPos(struct Sprite *sprite); void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); -void SetGreyscaleOrOriginalPalette(u16 palNum, bool8 restoreOriginal); +void SetGrayscaleOrOriginalPalette(u16 palNum, bool8 restoreOriginal); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); bool8 RunAffineAnimFromTaskData(struct Task *task); void AnimThrowProjectile(struct Sprite *sprite); |