Merge branch 'master' into pokeball-doc

1 files changed, 3 insertions, 1 deletions

diff --git a/src/m4a.c b/src/m4a.c
index 267a72657..11a4525ea 100644
--- a/src/m4a.c
+++ b/src/m4a.c
@@ -904,7 +904,9 @@ void CgbModVol(struct CgbChannel *chan)
         // Force chan->rightVolume and chan->leftVolume to be read from memory again,
         // even though there is no reason to do so.
         // The command line option "-fno-gcse" achieves the same result as this.
-        asm("" : : : "memory");
+        #ifndef NONMATCHING
+            asm("" : : : "memory");
+        #endif
 
         chan->eg = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
         if (chan->eg > 15)