diff options
author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /src/battle_anim.c | |
parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) |
fix merge conflicts
Diffstat (limited to 'src/battle_anim.c')
-rw-r--r-- | src/battle_anim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index fa3ac73be..2eec0bed5 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -423,7 +423,7 @@ static void ScriptCmd_createsprite(void) if (subpriority < 3) subpriority = 3; - CreateSpriteAndAnimate(template, sub_80A5C6C(gAnimBankTarget, 2), sub_80A5C6C(gAnimBankTarget, 3), subpriority); + CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority); gAnimVisualTaskCount++; } |