diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index ed0e68d8..e7256aa8 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -137,8 +137,8 @@ EXTSYM NumInputDevices,GUIInputNames EXTSYM GUIVideoModeNames EXTSYM GUISLVID,GUIINVID,GUIEAVID,GUIIEVID,GUIFSVID,GUIWSVID EXTSYM GUISSVID,GUITBVID,GUIHSVID,GUI2xVID,GUII2VID,GUIM7VID -EXTSYM cfgsoundon,cfgSoundQuality,cfgStereoSound -EXTSYM convertnum,converthex +EXTSYM cfgsoundon,cfgSoundQuality,cfgStereoSound,cfgforce8b +EXTSYM Force8b,convertnum,converthex EXTSYM per2exec EXTSYM hostname EXTSYM UDPConfig diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index b03a905f..20a8c32c 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -1208,6 +1208,12 @@ GUISoundKeys: jne .notenablesound xor byte[cfgsoundon],1 .notenablesound +%ifdef __MSDOS__ + cmp dh,'F' + jne .notforce8b + xor byte[cfgforce8b],1 +.notforce8b +%endif cmp dh,'S' jne .notstereo xor byte[cfgStereoSound],1 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 8e13d7a8..da56fdbb 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2348,6 +2348,9 @@ DisplayGUISoundClick: mov edx,[GUImouseposy] sub edx,[GUIwinposy+6*4] GUIClickCButton 11,21,byte[cfgsoundon] +%ifdef __MSDOS__ + GUIClickCButton 102,21,byte[cfgforce8b] +%endif GUIClickCButton 11,30,byte[cfgStereoSound] GUIClickCButton 11,39,byte[RaisePitch] GUIClickCButton 11,101,byte[SoundNoiseDis] diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 7d646356..d847bc8f 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -2170,6 +2170,7 @@ DisplayGUISound: ; cmp byte[OSPort],3 ; je near .win32b %ifdef __MSDOS__ + GUIOuttextwin2u 6,116,26,GUISoundText1b,0 GUIOuttextwin2u 6,26,44,GUISoundText2b,1 %endif ;.win32b @@ -2197,6 +2198,7 @@ DisplayGUISound: ; cmp byte[OSPort],3 ; je near .win32c %ifdef __MSDOS__ + GUIOuttextwin2 6,115,25,GUISoundText1b GUIOuttextwin2 6,25,43,GUISoundText2b %endif ;.win32c @@ -2241,6 +2243,14 @@ DisplayGUISound: mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox GUIDisplayIconWin 6,11,21,[GUITemp] +%ifdef __MSDOS__ + mov dword[GUITemp],GUIIconDataCheckBoxUC + cmp byte[cfgforce8b],0 + je .nocheckbox0 + mov dword[GUITemp],GUIIconDataCheckBoxC +.nocheckbox0 + GUIDisplayIconWin 6,102,21,[GUITemp] +%endif mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[cfgStereoSound],0 je .nocheckbox1 @@ -2399,6 +2409,7 @@ DisplayGUISound: ret GUISoundText1 db 'ENABLE SOUND',0 +GUISoundText1b db 'FORCE 8-BIT',0 GUISoundText2 db 'SAMPLING RATE :',0 GUISoundText2b db 'RAISE PITCH LEVEL',0 GUISoundText3 db 'STEREO SOUND',0