diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-04-25 00:28:57 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-04-25 00:28:57 -0400 |
| commit | 6a401b53867de87165f625510624c4a296dba34b (patch) | |
| tree | 1a03aba54ebed695fffe2c11a1eb26f2b975f960 /include/battle_anim.h | |
| parent | 069a7e71fc8bd0886fe2d5c39bb96d8fee0d798b (diff) | |
| parent | 867b496f2e5a525043c9fd82ccaaad9349c89fac (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
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 |