summaryrefslogtreecommitdiff
path: root/src/m4a_4.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-11-29 00:52:32 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-11-29 00:52:32 -0600
commit70743f4b951bb84ca33fd2151e55b2f5018eb6c5 (patch)
tree7298959f4e81c88adeac0c26b9016b9d197da1fd /src/m4a_4.c
parent52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (diff)
parent54da96309186b98263b4434911e1c5b8d4b4e3ec (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/m4a_4.c')
-rw-r--r--src/m4a_4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/m4a_4.c b/src/m4a_4.c
index 99195ec00..e645fbef5 100644
--- a/src/m4a_4.c
+++ b/src/m4a_4.c
@@ -45,7 +45,7 @@ void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
mplayInfo->ident = ID_NUMBER;
}
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch)
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
{
s32 i;
u32 bit;
@@ -66,7 +66,7 @@ void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
{
if (track->flags & MPT_FLG_EXIST)
{
- track->keyShiftX = (s16)pitch >> 8;
+ track->keyShiftX = pitch >> 8;
track->pitX = pitch;
track->flags |= MPT_FLG_PITCHG;
}