From 64146bed5ef921da386677e55e844268690af886 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 3 Mar 2022 04:53:40 -0500
Subject: [PATCH] OPLL: i think i got it

---
 src/engine/platform/opll.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/engine/platform/opll.cpp b/src/engine/platform/opll.cpp
index df4fca9ec..7ae61745d 100644
--- a/src/engine/platform/opll.cpp
+++ b/src/engine/platform/opll.cpp
@@ -440,7 +440,7 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
           }
           rWrite(0x36,drumVol[0]);
           rWrite(0x37,drumVol[1]|(drumVol[4]<<4));
-          rWrite(0x38,drumVol[2]|(drumVol[3]<<4));
+          rWrite(0x38,drumVol[3]|(drumVol[2]<<4));
         }
         chan[c.chan].freqChanged=true;
       }
@@ -475,10 +475,9 @@ int DivPlatformOPLL::dispatch(DivCommand c) {
         drumVol[c.chan-6]=15-chan[c.chan].outVol;
         rWrite(0x36,drumVol[0]);
         rWrite(0x37,drumVol[1]|(drumVol[4]<<4));
-        rWrite(0x38,drumVol[2]|(drumVol[3]<<4));
+        rWrite(0x38,drumVol[3]|(drumVol[2]<<4));
         break;
-      }
-      if (c.chan<6 || !drums) {
+      } else if (c.chan<6 || !drums) {
         rWrite(0x30+c.chan,((15-(chan[c.chan].outVol*(15-chan[c.chan].state.op[1].tl))/15)&15)|(chan[c.chan].state.opllPreset<<4));
       }
       break;