falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detune units

This commit is contained in:
z64a 2025-05-28 02:21:16 -04:00
parent ab250ab6a0
commit 22c2befb85
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio.h
View File

@ -412,13 +412,13 @@ typedef union SeqArgs {
u8 value;
} TrackVolume;
struct { // cmd ED
u8 cent;
s8 cent;
} InstrumentCoarseTune;
struct { // cmd EE
u8 value;
s8 cent;
} InstrumentFineTune;
struct { // cmd EF
u16 cents;
s16 cents;
} TrackDetune;
struct { // cmd F0
u8 delay;

6
src/audio/bgm_player.c
View File

@ -1644,11 +1644,11 @@ void au_BGMCmd_EC_TrackVolume(BGMPlayer* player, BGMPlayerTrack* track) {
}
void au_BGMCmd_ED_InstrumentCoarseTune(BGMPlayer* player, BGMPlayerTrack* track) {
track->insCoarseDetune = (s8)player->seqCmdArgs.InstrumentCoarseTune.cent * 100;
track->insCoarseDetune = player->seqCmdArgs.InstrumentCoarseTune.cent * 100;
}
void au_BGMCmd_EE_InstrumentFineTune(BGMPlayer* player, BGMPlayerTrack* track) {
track->insFineDetune = player->seqCmdArgs.InstrumentFineTune.value;
track->insFineDetune = player->seqCmdArgs.InstrumentFineTune.cent;
}
void au_BGMCmd_EC_TrackDetune(BGMPlayer* player, BGMPlayerTrack* track) {
@ -1741,7 +1741,7 @@ void au_BGMCmd_FE_Detour(BGMPlayer* player, BGMPlayerTrack* track) {
track->bgmReadPos = readPos;
}
// jump to another part of the track, selected by player->proxMixID
// jump to another part of the track, selected by player->branchVar
void au_BGMCmd_FC_Branch(BGMPlayer* player, BGMPlayerTrack* track) {
AuFilePos args;
u32 i;

6
src/audio/snd_interface.c
View File

@ -822,11 +822,11 @@ void snd_song_set_proximity_mix_far(s32 songName, s32 mix) {
}
void snd_song_set_proximity_mix_near(s32 songName, s32 mix) {
au_bgm_set_proximity_mix(songName, (u8)mix | ((s32)(0.69f * AU_MAX_VOLUME_8) << 0x18));
au_bgm_set_proximity_mix(songName, (u8)mix | ((s32)(0.69f * AU_MAX_VOLUME_8) << 24));
}
void snd_song_set_proximity_mix_full(s32 songName, s32 mix) {
au_bgm_set_proximity_mix(songName, (u8)mix | (AU_MAX_VOLUME_8 << 0x18));
au_bgm_set_proximity_mix(songName, (u8)mix | (AU_MAX_VOLUME_8 << 24));
}
void snd_song_poll_music_events(MusicEventTrigger** musicEvents, s32* count) {
@ -844,7 +844,7 @@ void snd_song_trigger_music_event(s32 playerID, s32 trackIndex, s32 eventInfo) {
AuGlobals* globals = gSoundGlobals;
if (globals->musicEventQueueCount < MUS_QUEUE_SIZE) {
*globals->musicEventQueuePos++ = ((playerID << 0x1C) + ((trackIndex & 0xF) << 0x18) + eventInfo);
*globals->musicEventQueuePos++ = ((playerID << 28) + ((trackIndex & 0xF) << 24) + eventInfo);
globals->musicEventQueueCount++;
}
}