diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
| commit | 516a5b2219c99050153d989a65478f960b54f75a (patch) | |
| tree | 97a12007165839735210f0f777a019cf3ecc060d /include/battle_anim.h | |
| parent | 19d9cff2ff582d68d5aa76fd9d2068a6407e1466 (diff) | |
| parent | d1fe93bf4adfb691ba3a9220a469e0e40483d809 (diff) | |
fix merge conflicts, review changes
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index e912af6b1..c055e94fa 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -92,7 +92,11 @@ u8 sub_80A6D94(void); u8 sub_80A8364(u8); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); -u8 sub_80A6138(u8 bank); +u8 GetBankSpriteDefault_Y(u8 bank); u8 sub_80A82E4(u8 bank); +u8 GetSubstituteSpriteDefault_Y(u8 bank); + +// battle_anim_80A9C70.s +void LaunchStatusAnimation(u8 bank, u8 statusAnimId); #endif // GUARD_BATTLE_ANIM_H |