summaryrefslogtreecommitdiff
path: root/src/battle/anim
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim')
-rw-r--r--src/battle/anim/current.c2
-rw-r--r--src/battle/anim/devil.c2
-rw-r--r--src/battle/anim/energy_wave.c2
-rw-r--r--src/battle/anim/flying_path.c2
-rw-r--r--src/battle/anim/ghost.c2
-rw-r--r--src/battle/anim/hidden_power_orbit.c2
-rw-r--r--src/battle/anim/orbit.c4
-rw-r--r--src/battle/anim/orbs.c6
-rw-r--r--src/battle/anim/shadow_minimize.c2
-rw-r--r--src/battle/anim/sonic.c8
10 files changed, 16 insertions, 16 deletions
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 41b7dda42..94d74b96e 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -1298,7 +1298,7 @@ void sub_80D759C(u8 taskId)
}
task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
- task->data[12] = sub_8079E90(gAnimBankTarget) - 2;
+ task->data[12] = GetBattlerSubpriority(gAnimBankTarget) - 2;
task->data[0]++;
break;
case 1:
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
index ebec1f58e..8e1010d2b 100644
--- a/src/battle/anim/devil.c
+++ b/src/battle/anim/devil.c
@@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite)
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
StartSpriteAnim(sprite, 0);
- sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1;
+ sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1;
sprite->data[2] = 1;
}
sprite->data[0] += sprite->data[2];
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index 7118b5acc..cdf3e3ced 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -232,7 +232,7 @@ void sub_80D3698(struct Sprite *sprite)
sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
sprite->pos2.y = -10;
- subpriority = sub_8079E90(gAnimBankAttacker);
+ subpriority = GetBattlerSubpriority(gAnimBankAttacker);
if (!IsContest())
{
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index d2f85ad35..c9c506919 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -84,7 +84,7 @@ void sub_80CBDF4(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- task->data[4] = sub_8079E90(gAnimBankTarget) - 1;
+ task->data[4] = GetBattlerSubpriority(gAnimBankTarget) - 1;
task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
task->data[10] = sub_807A100(gAnimBankTarget, 1);
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index cd2b4eb0c..130e7ff92 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -1219,7 +1219,7 @@ void sub_80DF1A4(u8 taskId)
task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8;
task->data[7] = 0;
task->data[5] = sub_8079ED4(gAnimBankAttacker);
- task->data[6] = sub_8079E90(gAnimBankAttacker) - 2;
+ task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2;
task->data[3] = 0;
task->data[4] = 16;
REG_BLDCNT = 0x3F40;
diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c
index 2fce2da37..3d1cd74c0 100644
--- a/src/battle/anim/hidden_power_orbit.c
+++ b/src/battle/anim/hidden_power_orbit.c
@@ -58,7 +58,7 @@ void AnimOrbitFast(struct Sprite* sprite)
sprite->affineAnimPaused = 1;
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = gBattleAnimArgs[1];
- sprite->data[7] = sub_8079E90(gAnimBankAttacker);
+ sprite->data[7] = GetBattlerSubpriority(gAnimBankAttacker);
sprite->callback = AnimOrbitFastStep;
sprite->callback(sprite);
}
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c
index 1c5ba144d..d59adde08 100644
--- a/src/battle/anim/orbit.c
+++ b/src/battle/anim/orbit.c
@@ -172,11 +172,11 @@ static void sub_80CADA8(struct Sprite* sprite)
sprite->pos2.y += Cos(sprite->data[5], -5);
if ((u16)(sprite->data[5] - 0x40) < 0x80)
{
- sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1;
+ sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1;
}
else
{
- sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1;
+ sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1;
}
sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index e78d8f974..3301990ec 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -235,11 +235,11 @@ static void sub_80CA8B4(struct Sprite* sprite)
{
if (sprite->data[5] > 0x7F)
{
- sprite->subpriority = sub_8079E90(gAnimBankTarget) + 1;
+ sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 1;
}
else
{
- sprite->subpriority = sub_8079E90(gAnimBankTarget) + 6;
+ sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 6;
}
sprite->pos2.x += Sin(sprite->data[5], 5);
sprite->pos2.y += Cos(sprite->data[5], 14);
@@ -258,7 +258,7 @@ void sub_80CA928(u8 taskId)
gBattleAnimArgs[1] = 0;
gBattleAnimArgs[2] = 80;
gBattleAnimArgs[3] = 0;
- CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gAnimBankTarget) + 1);
+ CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gAnimBankTarget) + 1);
}
if (gTasks[taskId].data[1] == 15)
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index 1a04fd58a..224896d86 100644
--- a/src/battle/anim/shadow_minimize.c
+++ b/src/battle/anim/shadow_minimize.c
@@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId)
task->data[4] = 0x100;
task->data[5] = 0;
task->data[6] = 0;
- task->data[7] = sub_8079E90(gAnimBankAttacker);
+ task->data[7] = GetBattlerSubpriority(gAnimBankAttacker);
task->func = sub_80D04E0;
}
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index d1e7f2e6b..1de546780 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -347,12 +347,12 @@ void sub_80CFB04(u8 taskId)
gBattleAnimArgs[4] ^= 0x80;
if (gBattleAnimArgs[4] >= 64)
{
- u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+ u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
gTasks[taskId].data[2] = var;
}
else
{
- u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4];
+ u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4];
gTasks[taskId].data[2] = var;
}
}
@@ -360,12 +360,12 @@ void sub_80CFB04(u8 taskId)
{
if (gBattleAnimArgs[4] >= 64)
{
- u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
+ u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64);
gTasks[taskId].data[2] = var;
}
else
{
- u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4];
+ u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4];
gTasks[taskId].data[2] = var;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 14:05:10 +0000