diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-04-18 11:40:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 11:40:01 -0500 |
| commit | 4e63a52832f4a443e24df4f38503e3b449b54e45 (patch) | |
| tree | b067dc24c27dfcb8fd924c96bdde0f77ad975326 /include/battle_anim.h | |
| parent | b5a269545a0e3eb4929d1044d088e69083744883 (diff) | |
| parent | 3d12a02f3e730ea864cab184c354e2e46d7d71c5 (diff) | |
Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks
decompile battle_anim_sound_tasks
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index aa62db46d..d6d4c05d6 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -47,7 +47,7 @@ extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT]; extern u8 gAnimMoveTurn; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u16 gAnimSpeciesByBanks[MAX_BATTLERS_COUNT]; +extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; extern u8 gUnknown_02038440; void ClearBattleAnimationVars(void); @@ -61,7 +61,7 @@ void sub_80A438C(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible); bool8 IsContest(void); s8 BattleAnimAdjustPanning(s8 pan); s8 BattleAnimAdjustPanning2(s8 pan); -s16 sub_80A52EC(s16 a); +s16 KeepPanInRange(s16 a); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); // battle_anim_80FE840.s |