summaryrefslogtreecommitdiff
path: root/src/battle/anim/psychic.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 16:02:31 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-06 16:02:31 -0700
commit818801cf5ab0c696f2460922753f921726aac6bb (patch)
tree9dde82014d4bc9949d1548d7c04c93227419eb2c /src/battle/anim/psychic.c
parentcbf2c5c2a9539f74d57f141f233b47923566e838 (diff)
Finish decompiling battle_9
Diffstat (limited to 'src/battle/anim/psychic.c')
-rw-r--r--src/battle/anim/psychic.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 2a9cd364e..294069efe 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -38,7 +38,7 @@ void sub_80DC5F4(u8 taskId);
void sub_80DB74C(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest())
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest())
{
sprite->oam.priority = 2;
sprite->subpriority = 200;
@@ -62,7 +62,7 @@ void sub_80DB74C(struct Sprite *sprite)
if (!IsContest() && IsDoubleBattle())
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
{
sprite->pos1.x = 72;
sprite->pos1.y = 80;
@@ -75,7 +75,7 @@ void sub_80DB74C(struct Sprite *sprite)
}
else
{
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
@@ -178,7 +178,7 @@ void sub_80DBA4C(struct Sprite *sprite)
if (!IsContest() && IsDoubleBattle())
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
{
sprite->pos1.x = 72 - gBattleAnimArgs[0];
sprite->pos1.y = gBattleAnimArgs[1] + 80;
@@ -211,7 +211,7 @@ void sub_80DBAF4(struct Sprite *sprite)
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
StartSpriteAnim(sprite, 1);
sprite->pos1.x -= 40;
@@ -234,7 +234,7 @@ void sub_80DBB70(struct Sprite *sprite)
s16 x = sub_807A100(gAnimBankAttacker, 1) / 2;
s16 y = sub_807A100(gAnimBankAttacker, 0) / -2;
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
{
x = -x;
}
@@ -306,7 +306,7 @@ void sub_80DBCFC(u8 taskId)
task->data[0] = spriteId;
task->data[1] = 0;
task->data[2] = 0;
- task->data[3] = GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8;
+ task->data[3] = GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8;
sub_80798F4(task, task->data[0], &gUnknown_083DA8C4);
task->func = sub_80DBD58;