diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /include/battle_anim.h | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
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 |