Fixed sound mute handling.

FluBBaOfWard · Sep 29, 2021 · cca36a5 · cca36a5
1 parent d8232a0
commit cca36a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -52,6 +52,7 @@ setMuteSoundGUI:
 ;@----------------------------------------------------------------------------
 setMuteT6W28:
 ;@----------------------------------------------------------------------------
+	and r0,r0,#0xFF
 	cmp r0,#0xAA
 	cmpne r0,#0x55
 	bxne lr