summaryrefslogtreecommitdiff
path: root/src/battle/anim
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim')
-rw-r--r--src/battle/anim/bullet.c2
-rw-r--r--src/battle/anim/cube.c2
-rw-r--r--src/battle/anim/current.c2
-rw-r--r--src/battle/anim/draw.c2
-rw-r--r--src/battle/anim/hop_2.c4
-rw-r--r--src/battle/anim/normal.c4
-rw-r--r--src/battle/anim/psychic.c2
-rw-r--r--src/battle/anim/rock.c4
-rw-r--r--src/battle/anim/scan.c4
-rw-r--r--src/battle/anim/sfx.c10
10 files changed, 18 insertions, 18 deletions
diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c
index 096023e9a..a47cfeccc 100644
--- a/src/battle/anim/bullet.c
+++ b/src/battle/anim/bullet.c
@@ -54,7 +54,7 @@ static void sub_80D0030(struct Sprite* sprite)
int i;
u16 rand;
s16* ptr;
- PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(0x3F));
+ PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->pos1.x += sprite->pos2.x;
sprite->pos1.y += sprite->pos2.y;
sprite->pos2.y = 0;
diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index 8e78e8d0b..5dd83c4bd 100644
--- a/src/battle/anim/cube.c
+++ b/src/battle/anim/cube.c
@@ -59,7 +59,7 @@ void sub_80CDFB0(struct Sprite* sprite)
sprite->data[2] = 0;
sprite->data[3] = 0;
sprite->data[4] = 0;
- sprite->data[5] = BattleAnimAdjustPanning(-0x40);
+ sprite->data[5] = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
sprite->callback = sub_80CE000;
}
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 94d74b96e..8547e9565 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -1175,7 +1175,7 @@ void sub_80D72DC(u8 taskId)
task->data[5] = -1;
task->data[11] = 12;
task->data[12] = BattleAnimAdjustPanning(task->data[11] - 76);
- task->data[13] = BattleAnimAdjustPanning(63);
+ task->data[13] = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
task->data[14] = task->data[12];
task->data[15] = (task->data[13] - task->data[12]) / 3;
task->data[0]++;
diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c
index 4e570be6b..b25c4fb9a 100644
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -128,7 +128,7 @@ void sub_80D0E30(struct Sprite* sprite)
sprite->data[3] = 16;
sprite->data[4] = 0;
sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2;
- sprite->data[6] = BattleAnimAdjustPanning(0x3F);
+ sprite->data[6] = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
sprite->callback = sub_80D0E8C;
}
diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c
index 6ecf6b392..5ebefd626 100644
--- a/src/battle/anim/hop_2.c
+++ b/src/battle/anim/hop_2.c
@@ -71,7 +71,7 @@ static void sub_80CBB60(struct Sprite* sprite)
sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
if (sprite->pos2.y == 0)
{
- PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(0x3F));
+ PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
}
if (sub_80CB814(sprite))
@@ -79,6 +79,6 @@ static void sub_80CBB60(struct Sprite* sprite)
sprite->pos2.y = 0;
sprite->data[0] = 0;
sprite->callback = sub_80CB8B8;
- PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(-0x40));
+ PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
}
}
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 7fa3ea265..9f0007e97 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -1426,9 +1426,9 @@ static void sub_80E3338(u8 taskId)
gTasks[taskId].func = sub_80E3704;
if (taskData[0] == 0)
- PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(-64));
+ PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
else
- PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(-64));
+ PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
}
static void sub_80E3704(u8 taskId)
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 9a4c211b7..140eadde1 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -1258,7 +1258,7 @@ void sub_80DC700(struct Sprite *sprite)
case 1:
if (sprite->affineAnimEnded)
{
- PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64));
+ PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
ChangeSpriteAffineAnim(sprite, 1);
sprite->data[0]++;
}
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index 4d9401854..4a6fcd89e 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -622,8 +622,8 @@ void sub_80DD4D4(u8 taskId)
task->data[6] = 0;
task->data[7] = 0;
- pan1 = BattleAnimAdjustPanning(-64);
- pan2 = BattleAnimAdjustPanning(63);
+ pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
+ pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
task->data[13] = pan1;
task->data[14] = (pan2 - pan1) / task->data[8];
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 8a87d4eb4..792e832cb 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -80,7 +80,7 @@ static void sub_80CD408(struct Sprite* sprite)
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData(sprite, sub_80CD4B8);
sprite->data[5] += 0x100;
- PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F));
+ PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
break;
}
@@ -166,7 +166,7 @@ static void sub_80CD5A8(struct Sprite* sprite)
sprite->data[2]++;
pal = sprite->oam.paletteNum;
LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
- PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(0x3F));
+ PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
}
else if (sprite->data[1] == 0)
{
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 17:46:36 +0000