Fixed sound option saving

zsnes/src/gui/gui.asm

@@ -398,7 +398,7 @@ NEWSYM pl2p209b, db 0
 NEWSYM pl3p209b, db 0
 NEWSYM pl4p209b, db 0
 JoyPad1Move db 0
-FirstTimeData db 0
+NEWSYM FirstTimeData, db 0
 NEWSYM PrevSWFix, db 0
 NEWSYM CalibXmin, dd 0
 NEWSYM CalibYmin, dd 0
@@ -2162,10 +2162,6 @@ NEWSYM StartGUI
     jne .nofirsttime
     call guifirsttimemsg
     mov byte[FirstTimeData],1
-%ifndef __MSDOS__
-    mov byte[soundon],1
-    mov byte[cfgsoundon],1
-%endif
 .nofirsttime
     cmp dword[GUICTimer],0
     je .notimer

zsnes/src/linux/sdlintrf.asm

@@ -199,8 +199,6 @@ NEWSYM SystemInit
     mov byte[esi+12+256],0
 %endif
 
-    mov byte[spcon],1
-
     ; Get and set the initial directory
 %ifdef __LINUX__
     call obtaindir
@@ -237,7 +235,6 @@ NEWSYM SystemInit
     mov ebx,SRAMDir
     call Change_Dir
 %endif	
-    mov byte[soundon],0
 ;    call getblaster                     ; get set blaster environment
 ;    cmp byte[Force8b],1
 ;    jne .noforce8b

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
+EXTSYM FPSOn,FPSAtStart,cfgsoundon,FirstTimeData
 EXTSYM xa
 EXTSYM SBPort,SBInt,SBIrq,SBDMA,SBDMAPage,SBHDMAPage,getenv,vibracard
 EXTSYM ram7fa,wramdataa
@@ -90,6 +90,14 @@ NEWSYM zstart
 	xor eax,eax
 .nocmdlinenetplay
 
+%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

zsnes/src/win/winintrf.asm

@@ -190,8 +190,6 @@ NEWSYM SystemInit
     mov byte[esi+11+256],'T'
     mov byte[esi+12+256],0
 
-    mov byte[spcon],1
-
     ; Get and set the initial directory
     mov ebx,InitDir
     mov edx,InitDrive
@@ -207,7 +205,6 @@ NEWSYM SystemInit
     call ccmdline
     call tparms
     call preparedir
-    mov byte[soundon],0
 ;    call getblaster                     ; get set blaster environment
 ;    cmp byte[Force8b],1
 ;    jne .noforce8b