pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

make set_music_track non-void

Browse Source 
Still matches; its return value is used in SetMusicTrack
This commit is contained in:
Alex Bates 2020-10-29 01:38:25 +00:00
parent 322932c295
commit d9d6595581
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -113,7 +113,7 @@ f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
ScriptInstance* get_script_by_index(s32 index);

4
src/code_e0b30_len_b80.c
View File

@ -57,12 +57,12 @@ s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime
}
}
void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
s32 set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
MusicPlayer* musicPlayers = &gMusicPlayers;
musicPlayers[playerIndex].flags &= ~8;
_set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
return _set_music_track(playerIndex, songID, variation, fadeOutTime, volume);
}
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);