summaryrefslogtreecommitdiff
path: root/src/battle/anim/shock.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 18:18:35 -0700
committerGitHub <noreply@github.com>2018-04-06 18:18:35 -0700
commitbe66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (patch)
tree137e905d499c0b3cabae75db88df52233604adc0 /src/battle/anim/shock.c
parent18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff)
parent3571cb1d142090b59a9161a6bada11f0caf53b8c (diff)
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
Diffstat (limited to 'src/battle/anim/shock.c')
-rw-r--r--src/battle/anim/shock.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
index 16e04c9db..19e4d0fb2 100644
--- a/src/battle/anim/shock.c
+++ b/src/battle/anim/shock.c
@@ -15,10 +15,10 @@ extern void sub_80DA48C(struct Sprite *);
void sub_80D6294(struct Sprite *sprite)
{
- sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
- sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y -= gBattleAnimArgs[1];
@@ -77,13 +77,13 @@ void sub_80D6328(struct Sprite *sprite)
if (gBattleAnimArgs[5] == 0)
{
- sprite->pos1.x = GetBankPosition(slot, 0);
- sprite->pos1.y = GetBankPosition(slot, 1);
+ sprite->pos1.x = GetBattlerSpriteCoord(slot, 0);
+ sprite->pos1.y = GetBattlerSpriteCoord(slot, 1);
}
else
{
- sprite->pos1.x = GetBankPosition(slot, 2);
- sprite->pos1.y = GetBankPosition(slot, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(slot, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(slot, 3);
}
sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;