From 4c3cf9f22e82e8a87abdd64878b8668d52b5c8a7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 16 Jan 2017 18:10:23 -0600 Subject: finish decompiling battle_anim.c --- src/sound.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sound.c') diff --git a/src/sound.c b/src/sound.c index c244c5cbe..e757eedf5 100644 --- a/src/sound.c +++ b/src/sound.c @@ -526,7 +526,7 @@ void PlaySE(u16 songNum) m4aSongNumStart(songNum); } -void PlaySE12WithPanning(u16 songNum, u8 pan) +void PlaySE12WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); @@ -535,21 +535,21 @@ void PlaySE12WithPanning(u16 songNum, u8 pan) m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); } -void PlaySE1WithPanning(u16 songNum, u8 pan) +void PlaySE1WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE1); m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); } -void PlaySE2WithPanning(u16 songNum, u8 pan) +void PlaySE2WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlay_SE2); m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); } -void SE12PanpotControl(u8 pan) +void SE12PanpotControl(s8 pan) { m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan); m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan); -- cgit v1.2.3 From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sound.c') diff --git a/src/sound.c b/src/sound.c index e757eedf5..ea8d5b49c 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,11 +1,11 @@ #include "global.h" #include "sound.h" #include "asm.h" +#include "battle.h" #include "gba/m4a_internal.h" -#include "task.h" -#include "songs.h" #include "m4a.h" -#include "battle.h" +#include "songs.h" +#include "task.h" struct Fanfare { -- cgit v1.2.3