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

Function prototype for set_music_track

Browse Source
This commit is contained in:
Jdog 2020-08-11 19:45:27 -07:00
parent ab39e96b1b
commit bcfb7c8a75
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
papermario/include/functions.h
View File

@ -19,5 +19,5 @@ s32 func_800554E8(s32, s32);
s32 func_800555E4(s32); s32 func_800555E4(s32);
s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); 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 #endif

2
papermario/src/code_e0b30_len_b80.c
View File

@ -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);
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); INCLUDE_ASM(code_e0b30_len_b80, func_8014A964);

4
papermario/src/code_fa4c0_len_3bf0.c
View File

@ -15,9 +15,9 @@ s32 SetMusicTrack(script_context* script, s32 initialCall) {
s32 musicPlayer = get_variable(script, *ptrReadPos++); s32 musicPlayer = get_variable(script, *ptrReadPos++);
s32 songID = get_variable(script, *ptrReadPos++); s32 songID = get_variable(script, *ptrReadPos++);
s32 variation = 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); INCLUDE_ASM(code_fa4c0_len_3bf0, FadeInMusic);