From cca36a5ce49cc29294bf8d32fb1296fe57eea2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Ahlstro=CC=88m?= <fredrikahlstrom75@gmail.com>
Date: Wed, 29 Sep 2021 18:55:14 +0200
Subject: [PATCH] Fixed sound mute handling.

---
 History.txt    | 5 ++++-
 source/Cart.s  | 2 +-
 source/Gui.c   | 2 +-
 source/Sound.s | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/History.txt b/History.txt
index 49b78e0..3e7cba8 100644
--- a/History.txt
+++ b/History.txt
@@ -2,6 +2,9 @@ NGPDS revision history
 -=-=-=-=-=-=-=-=-=-=-=-
 
 
+V0.5.0 - 2021-09-29 (FluBBa)
+	Fixed sound mute handling.
+
 V0.4.9 - 2021-09-28 (FluBBa)
 	Better flash emulation/saving/loading.
 	Fixed save/load state.
@@ -29,7 +32,7 @@ V0.4.5 - 2021-06-28 (FluBBa)
 	Sound working.
 
 V0.4.0 - 2021-05-18 (FluBBa)
-	Started port to Nintendo DS.
+	Started port to Nintendo DS & dekitPro.
 
 V0.3.0 - 2008-10-01 (FluBBa)
 	Fixed copy protection in "Metal Slug 2" (SNK logo in VRAM).
diff --git a/source/Cart.s b/source/Cart.s
index 424a127..2761d6c 100644
--- a/source/Cart.s
+++ b/source/Cart.s
@@ -79,9 +79,9 @@ machineInit: 	;@ Called from C
 //	bl cpuInit
 
 	bl gfxReset
+	bl ioReset
 	bl soundReset
 	bl cpuReset
-	bl ioReset
 
 	ldr r0,=g_BIOSBASE_COLOR
 	ldr r0,[r0]
diff --git a/source/Gui.c b/source/Gui.c
index 9026329..0bc4c81 100644
--- a/source/Gui.c
+++ b/source/Gui.c
@@ -15,7 +15,7 @@
 #include "K2GE/Version.h"
 #include "K2Audio/Version.h"
 
-#define EMUVERSION "V0.4.9 2021-09-28"
+#define EMUVERSION "V0.5.0 2021-09-29"
 
 #define HALF_CPU_SPEED		(1<<16)
 #define ALLOW_SPEED_HACKS	(1<<17)
diff --git a/source/Sound.s b/source/Sound.s
index 958e486..41f2b8f 100644
--- a/source/Sound.s
+++ b/source/Sound.s
@@ -52,6 +52,7 @@ setMuteSoundGUI:
 ;@----------------------------------------------------------------------------
 setMuteT6W28:
 ;@----------------------------------------------------------------------------
+	and r0,r0,#0xFF
 	cmp r0,#0xAA
 	cmpne r0,#0x55
 	bxne lr