diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-18 05:31:39 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-18 05:31:39 -0500 |
| commit | c259ee46d3e0b0fc7e9a43e6448ef74247fedbf0 (patch) | |
| tree | 7a4e53444248dd49aacbbf23a3af9f91cca8ef24 /src/battle_anim.c | |
| parent | 076d07f6fe24691d6d9d8872c049b18e2e16fa57 (diff) | |
| parent | c74468fd11b551e1babf18a4d320e114fe495bd8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 5e62c0957..88c548208 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1656,7 +1656,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = sub_80A82E4(gBattleAnimTarget) + (s8)(argVar); + subpriority = GetBattlerSpriteSubpriority(gBattleAnimTarget) + (s8)(argVar); } else { @@ -1665,7 +1665,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = sub_80A82E4(gBattleAnimAttacker) + (s8)(argVar); + subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) + (s8)(argVar); } if (subpriority < 3) |