From 22c2befb85a69fa3ca272cf28e2d3a6c6fb5dc12 Mon Sep 17 00:00:00 2001
From: z64a <cloverhax@gmail.com>
Date: Wed, 28 May 2025 02:21:16 -0400
Subject: [PATCH] detune units

---
 src/audio.h               | 6 +++---
 src/audio/bgm_player.c    | 6 +++---
 src/audio/snd_interface.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/audio.h b/src/audio.h
index d0b97f0e52..6bb3f947b4 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -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;
diff --git a/src/audio/bgm_player.c b/src/audio/bgm_player.c
index fc898b7287..6dbaad28fe 100644
--- a/src/audio/bgm_player.c
+++ b/src/audio/bgm_player.c
@@ -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;
diff --git a/src/audio/snd_interface.c b/src/audio/snd_interface.c
index f475b5eb39..fa2b2baaed 100644
--- a/src/audio/snd_interface.c
+++ b/src/audio/snd_interface.c
@@ -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++;
     }
 }