diff --git a/papermario/include/functions.h b/papermario/include/functions.h index d495f54906..47b91a0b6b 100644 --- a/papermario/include/functions.h +++ b/papermario/include/functions.h @@ -19,5 +19,5 @@ s32 func_800554E8(s32, s32); s32 func_800555E4(s32); s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); - +s32 set_music_track(s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); #endif diff --git a/papermario/src/code_e0b30_len_b80.c b/papermario/src/code_e0b30_len_b80.c index 6e2fd7dd93..5178ece24d 100644 --- a/papermario/src/code_e0b30_len_b80.c +++ b/papermario/src/code_e0b30_len_b80.c @@ -10,7 +10,7 @@ INCLUDE_ASM(code_e0b30_len_b80, func_8014A548); INCLUDE_ASM(code_e0b30_len_b80, _set_music_track); -INCLUDE_ASM(code_e0b30_len_b80, set_music_track); +s32 INCLUDE_ASM(code_e0b30_len_b80, set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); INCLUDE_ASM(code_e0b30_len_b80, func_8014A964); diff --git a/papermario/src/code_fa4c0_len_3bf0.c b/papermario/src/code_fa4c0_len_3bf0.c index 44b889a82c..973aa33c98 100644 --- a/papermario/src/code_fa4c0_len_3bf0.c +++ b/papermario/src/code_fa4c0_len_3bf0.c @@ -15,9 +15,9 @@ s32 SetMusicTrack(script_context* script, s32 initialCall) { s32 musicPlayer = get_variable(script, *ptrReadPos++); s32 songID = get_variable(script, *ptrReadPos++); s32 variation = get_variable(script, *ptrReadPos++); - s32 volume = get_variable(script, *ptrReadPos++); + s16 volume = get_variable(script, *ptrReadPos++); - return (set_music_track(musicPlayer, songID, variation, 0x1F4, (volume << 0x10) >> 0x10) != 0) * 2; + return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * 2; } INCLUDE_ASM(code_fa4c0_len_3bf0, FadeInMusic);