From 967c72694255dad5eea480a4595aa1bdfeb6eb67 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Sat, 15 Oct 2005 19:09:40 +0000
Subject: [PATCH] Reenable all sound channels on state load, removed some
 useless code.

---
 zsnes/src/vcache.asm |  2 --
 zsnes/src/zstate.c   | 13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm
index 339c797e..8a248724 100644
--- a/zsnes/src/vcache.asm
+++ b/zsnes/src/vcache.asm
@@ -530,10 +530,8 @@ NEWSYM cachevideo
     mov byte[disableeffects],0
     mov byte[osm2dis],0
     mov byte[EmuSpeed],29
-    push eax
     mov al,[snesinputdefault]
     mov [snesmouse],al
-    pop eax
     mov dword[Msgptr],panickeyp
     mov eax,[MsgCount]
     mov [MessageOn],eax
diff --git a/zsnes/src/zstate.c b/zsnes/src/zstate.c
index 80961834..180215ee 100755
--- a/zsnes/src/zstate.c
+++ b/zsnes/src/zstate.c
@@ -845,6 +845,10 @@ void zst_sram_load_compressed(FILE *fp)
   }
 }
 
+
+extern unsigned char Voice0Disable, Voice1Disable, Voice2Disable, Voice3Disable;
+extern unsigned char Voice4Disable, Voice5Disable, Voice6Disable, Voice7Disable;
+
 void stateloader (char *statename, unsigned char keycheck, unsigned char xfercheck)
 {
   extern unsigned char PauseLoad;
@@ -938,6 +942,15 @@ void stateloader (char *statename, unsigned char keycheck, unsigned char xferche
     Msgptr = txtnfndmsg; // 'UNABLE TO LOAD STATE X.'
   }
 
+  Voice0Disable = 1;
+  Voice1Disable = 1;
+  Voice2Disable = 1;
+  Voice3Disable = 1;
+  Voice4Disable = 1;
+  Voice5Disable = 1;
+  Voice6Disable = 1;
+  Voice7Disable = 1;
+
   stim();
 }