summaryrefslogtreecommitdiff
path: root/src/battle/anim/silhouette.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/silhouette.c
parent18a6fb5c3fcdc852a8ee805ba02b2807938e1de8 (diff)
parent3571cb1d142090b59a9161a6bada11f0caf53b8c (diff)
Merge pull request #590 from huderlem/battle_9
Decompile battle_9
Diffstat (limited to 'src/battle/anim/silhouette.c')
-rw-r--r--src/battle/anim/silhouette.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c
index a3147f598..00bb24762 100644
--- a/src/battle/anim/silhouette.c
+++ b/src/battle/anim/silhouette.c
@@ -15,7 +15,7 @@ static void sub_80CB438(u8 taskId);
void sub_80CB340(u8 taskId)
{
- u8 spriteId = GetAnimBankSpriteId(1);
+ u8 spriteId = GetAnimBattlerSpriteId(1);
if (gSprites[spriteId].invisible)
{
DestroyAnimVisualTask(taskId);
@@ -32,10 +32,10 @@ void sub_80CB340(u8 taskId)
void sub_80CB3A8(u8 taskId)
{
- u8 spriteId = GetAnimBankSpriteId(1);
+ u8 spriteId = GetAnimBattlerSpriteId(1);
gTasks[taskId].data[10] += gTasks[taskId].data[0];
gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
- if (GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankTarget))
{
gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
}
@@ -57,7 +57,7 @@ void sub_80CB438(u8 taskId)
{
if (gTasks[taskId].data[0] == 0)
{
- u8 spriteId = GetAnimBankSpriteId(1);
+ u8 spriteId = GetAnimBattlerSpriteId(1);
sub_8078F40(spriteId);
gSprites[spriteId].pos2.x = 0;
gSprites[spriteId].pos2.y = 0;