diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/thought.c | |
parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/thought.c')
-rw-r--r-- | src/battle/anim/thought.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index c3ab6f82c..5163cbfad 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -15,12 +15,12 @@ static void sub_80CF008(struct Sprite* sprite); void sub_80CEF44(u8 bank, struct Sprite* sprite) { - if (GetBankSide(bank) == 0) + if (GetBattlerSide(bank) == 0) sprite->pos1.x = sub_807A100(bank, 5) + 8; else sprite->pos1.x = sub_807A100(bank, 4) - 8; - sprite->pos1.y = GetBankPosition(bank, 3) - (s16)sub_807A100(bank, 0) / 4; + sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) - (s16)sub_807A100(bank, 0) / 4; } void sub_80CEF9C(struct Sprite* sprite) @@ -33,7 +33,7 @@ void sub_80CEF9C(struct Sprite* sprite) bank = gAnimBankTarget; sub_80CEF44(bank, sprite); - a = (GetBankSide(bank) == 0) ? 0 : 1; + a = (GetBattlerSide(bank) == 0) ? 0 : 1; sprite->data[0] = gBattleAnimArgs[1]; sprite->data[1] = a + 2; StartSpriteAnim(sprite, a); |