diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-21 00:20:09 +0100 |
| commit | 3d8874d9190f8904e5fc45439aa54fdf325fad48 (patch) | |
| tree | caa1f1f0a2f86094cbaa36b77a69a1547bd4b105 /src/battle_anim_sound_tasks.c | |
| parent | 7a072d4527387cf21a019142caf67ce516be861d (diff) | |
| parent | 2a3ba78831f2dca1ff0d3fe3f03844a993597b28 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/battle_anim_sound_tasks.c')
| -rw-r--r-- | src/battle_anim_sound_tasks.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 6993bd2ee..7b8eb4ed7 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -23,8 +23,8 @@ void sub_8158B30(u8 taskId) gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[1] = gBattleAnimArgs[1]; - pan1 = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); - pan2 = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT); + pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); + pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET); panIncrement = CalculatePanIncrement(pan1, pan2, 2); gTasks[taskId].data[2] = pan1; @@ -64,7 +64,7 @@ static void sub_8158C04(u8 taskId) s8 pan; gTasks[taskId].data[10] = 0; - pan = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT); + pan = BattleAnimAdjustPanning(SOUND_PAN_TARGET); PlaySE12WithPanning(gTasks[taskId].data[1], pan); if (++gTasks[taskId].data[11] == 2) DestroyAnimSoundTask(taskId); @@ -127,7 +127,7 @@ static void sub_8158D08(u8 taskId) void sub_8158D8C(u8 taskId) { u16 species = 0; - s8 pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); + s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) { if (gBattleAnimArgs[0] == ANIM_ATTACKER) @@ -173,7 +173,7 @@ void sub_8158D8C(u8 taskId) void sub_8158E9C(u8 taskId) { u16 species = 0; - s8 pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); + s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) { if (gBattleAnimArgs[0] == ANIM_ATTACKER) @@ -278,7 +278,7 @@ void sub_81590B8(u8 taskId) s8 pan; gTasks[taskId].data[10] = gBattleAnimArgs[0]; - pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); + pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER); if (IsContest()) species = gContestResources->field_18->unk0; |