diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:41:25 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:41:25 +0000 |
| commit | 2acab81713aac51f96a50dc42a67ec7761901aa4 (patch) | |
| tree | c39251dc3e6eb2f7cc884cbe4953b8c34dce8423 /include/battle_anim.h | |
| parent | e373cf4bb9217eb5e4edba08c7cb95ecc895b821 (diff) | |
| parent | 72b57b342eaf6e4a3ea77fae8b40e4ab11c64ae2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
also started fixing pointers in my dumps
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 |