summaryrefslogtreecommitdiff
path: root/src/battle/anim/sfx.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-10-17 17:01:38 -0500
committerGitHub <noreply@github.com>2018-10-17 17:01:38 -0500
commit6467ff26999d89252092d727f507f8b4b562c25c (patch)
tree8c952a7748119de80a36aee062bd953bd02fbb66 /src/battle/anim/sfx.c
parent09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (diff)
parent2ac92e38ffa627b49ce2c634b35d1a0e1835f0af (diff)
Merge pull request #697 from garakmon/battle-scrcmd-labels
Battle scrcmd labels
Diffstat (limited to 'src/battle/anim/sfx.c')
-rw-r--r--src/battle/anim/sfx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index 6d47f0b46..e41251964 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -27,8 +27,8 @@ void sub_812AF30(u8 taskId)
TASK.data[0] = gBattleAnimArgs[0];
TASK.data[1] = gBattleAnimArgs[1];
- sourcePan = BattleAnimAdjustPanning(-64);
- targetPan = BattleAnimAdjustPanning(63);
+ sourcePan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
+ targetPan = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
panIncrement = CalculatePanIncrement(sourcePan, targetPan, 2);
TASK.data[2] = sourcePan;
@@ -70,7 +70,7 @@ static void sub_812B004(u8 taskId)
{
TASK.data[10] = 0;
- pan = BattleAnimAdjustPanning(63);
+ pan = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
PlaySE12WithPanning(TASK.data[1], pan);
if (++TASK.data[11] == 2)
@@ -145,7 +145,7 @@ static void sub_812B108(u8 taskId)
void sub_812B18C(u8 taskId)
{
u16 species = 0;
- s8 pan = BattleAnimAdjustPanning(-64);
+ s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
if (IsContest())
{
@@ -197,7 +197,7 @@ void sub_812B18C(u8 taskId)
void sub_812B2B8(u8 taskId)
{
u16 species;
- s8 pan = BattleAnimAdjustPanning(-64);
+ s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
if (IsContest())
species = shared19348.unk0;