From 75aa21842c171f9bf01a44a10705587d16ec6212 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Fri, 28 Jun 2002 23:46:14 +0000
Subject: [PATCH] Fixed sound on first run

---
 zsnes/src/linux/sdlintrf.asm |  4 ++++
 zsnes/src/ui.asm             | 10 +---------
 zsnes/src/win/winintrf.asm   |  4 ++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index f96ac9d7..f02e0763 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -170,6 +170,10 @@ NEWSYM SystemInit
     mov byte[esi+11+256],'t'
     mov byte[esi+12+256],0
 
+    mov byte[spcon],1
+    mov byte[soundon],1
+    mov byte[cfgsoundon],1
+
     ; Get and set the initial directory
 %ifdef __LINUX__
     call obtaindir
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 90459830..b61bdee6 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -21,7 +21,7 @@ EXTSYM getcfg,soundon,SBHDMA,StereoSound,init,GUIRestoreVars,GUIClick,MouseDis
 EXTSYM ConvertJoyMap,ConvertJoyMap1,ConvertJoyMap2,printhex,InitSPC
 EXTSYM StartUp,PrintStr,WaitForKey,PrintChar,ZFileSystemInit
 EXTSYM SPCDisable,SystemInit,allocmem
-EXTSYM FPSOn,FPSAtStart,cfgsoundon,FirstTimeData
+EXTSYM FPSOn,FPSAtStart,cfgsoundon
 EXTSYM xa
 EXTSYM SBPort,SBInt,SBIrq,SBDMA,SBDMAPage,SBHDMAPage,getenv,vibracard
 EXTSYM ram7fa,wramdataa
@@ -69,14 +69,6 @@ NEWSYM zstart
 
 	cld                     ;clear direction flag
 
-%ifndef __MSDOS__
-        cmp byte[FirstTimeData],1
-        je .nofirsttime
-	mov byte[soundon],1
-	mov byte[cfgsoundon],1
-.nofirsttime
-%endif
-
 	call setnoise
 	call InitSPC
 	call allocmem           ;allocate memory
diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm
index af790182..8579832d 100644
--- a/zsnes/src/win/winintrf.asm
+++ b/zsnes/src/win/winintrf.asm
@@ -189,6 +189,10 @@ NEWSYM SystemInit
     mov byte[esi+11+256],'t'
     mov byte[esi+12+256],0
 
+    mov byte[spcon],1
+    mov byte[soundon],1
+    mov byte[cfgsoundon],1
+
     ; Get and set the initial directory
     mov ebx,InitDir
     mov edx,InitDrive