From 91620199e55740698129fc098d5f92ffb9e2fd69 Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Sat, 30 Nov 2024 13:16:31 -0600
Subject: [PATCH] Fixed mixer differences and reenabled reverb

---
 src/audio/heap.c  | 5 +----
 src/audio/mixer.c | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/audio/heap.c b/src/audio/heap.c
index 229240a26..3e88dbf1e 100644
--- a/src/audio/heap.c
+++ b/src/audio/heap.c
@@ -663,9 +663,7 @@ void audio_reset_session(void) {
     for (var_s5 = 0; var_s5 < 4; var_s5++) {
         gSynthesisReverbs[var_s5].useReverb = 0;
     }
-    
-    // LTODO: Reverbs are causing distortion.
-    #if 0
+ 
     gNumSynthesisReverbs = temp_s6->numReverbs;
     for (var_s5 = 0; var_s5 < gNumSynthesisReverbs; var_s5++) {
         reverb = &gSynthesisReverbs[var_s5];
@@ -698,7 +696,6 @@ void audio_reset_session(void) {
             }
         }
     }
-    #endif
 
     func_800BB030(gMaxSimultaneousNotes);
     osWritebackDCacheAll();
diff --git a/src/audio/mixer.c b/src/audio/mixer.c
index de780c7ea..a1154886e 100644
--- a/src/audio/mixer.c
+++ b/src/audio/mixer.c
@@ -274,7 +274,7 @@ void aResampleImpl(uint8_t flags, uint16_t pitch, RESAMPLE_STATE state) {
 
 void aEnvSetup1Impl(uint8_t initial_vol_wet, uint16_t rate_wet, uint16_t rate_left, uint16_t rate_right) {
     rspa.vol_wet = (uint16_t)(initial_vol_wet << 8);
-    rspa.rate_wet = rate_wet;
+    rspa.rate_wet = 0;
     rspa.rate[0] = rate_left;
     rspa.rate[1] = rate_right;
 }
@@ -289,6 +289,7 @@ void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb,
                    uint16_t dry_left_addr, uint16_t dry_right_addr,
                    uint16_t wet_left_addr, uint16_t wet_right_addr)
 {
+    swap_reverb = false;
     int16_t *in = BUF_S16(in_addr);
     int16_t *dry[2] = {BUF_S16(dry_left_addr), BUF_S16(dry_right_addr)};
     int16_t *wet[2] = {BUF_S16(wet_left_addr), BUF_S16(wet_right_addr)};