diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-17 15:59:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 15:59:08 -0600 |
| commit | 26bfd93b3599b76b0d0edad441fe79f261e4d04e (patch) | |
| tree | df73355f94e2f7fb78cc2c4b02c33291df187944 /include | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
| parent | 60484153a5630bfe88c1623b7ec1cf7052d67752 (diff) | |
Merge pull request #451 from shinny456/master
decompile electric.s
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index e0c1b2b08..e6540630a 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -106,7 +106,7 @@ void sub_80A8048(s16 *bottom, s16 *top, const void *ptr); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); -u8 sub_80A82E4(u8 battlerId); +u8 GetBattlerSubpriority(u8 battlerId); bool8 TranslateAnimArc(struct Sprite *sprite); void sub_80A6630(struct Sprite *sprite); void sub_80A6680(struct Sprite *sprite); @@ -159,7 +159,6 @@ u8 sub_80A8364(u8 battlerId); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); u8 GetBattlerSpriteDefault_Y(u8 battlerId); -u8 sub_80A82E4(u8 battlerId); u8 GetSubstituteSpriteDefault_Y(u8 battlerId); // battle_anim_80A9C70.s |