From 03458c1e743d7e453961e90a4e62e4e2ec60c1da Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Wed, 11 Sep 2002 01:54:51 +0000
Subject: [PATCH] Removed noise simulation option from GUI

---
 zsnes/src/gui/guikeys.inc  |  4 ----
 zsnes/src/gui/guimouse.inc |  2 +-
 zsnes/src/gui/guiwindp.inc | 16 ++++++++--------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index 6ba47a5e..c9ad7478 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -1233,10 +1233,6 @@ GUISoundKeys:
     xor byte[RaisePitch],1
 .noraisepitch
 %endif
-    cmp dh,'N'
-    jne .notnoise
-    xor byte[SoundNoiseDis],1
-.notnoise
     cmp dh,'R'
     jne .notsrate
     xor eax,eax
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index ce7f94b5..8390e54c 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2327,7 +2327,7 @@ DisplayGUISoundClick:
 %endif
     GUIClickCButton 11,30,byte[cfgStereoSound]
     GUIClickCButton 11,39,byte[RaisePitch]
-    GUIClickCButton 11,101,byte[SoundNoiseDis]
+;    GUIClickCButton 11,101,byte[SoundNoiseDis]
     GUIClickCButton 11,111,byte[RevStereo]
 ;    cmp byte[OSPort],3
 ;    je near .win32sound
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index eb2f5962..6b7330e9 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -2172,7 +2172,7 @@ DisplayGUISound:
     GUIOuttextwin2u 6,26,44,GUISoundText2b,1
 %endif
 ;.win32b
-    GUIOuttextwin2u 6,26,106,GUISoundText4,8
+;    GUIOuttextwin2u 6,26,106,GUISoundText4,8
     GUIOuttextwin2u 6,26,116,GUISoundTextH,2
 ;    cmp byte[OSPort],3
 ;    je near .win32s2
@@ -2200,7 +2200,7 @@ DisplayGUISound:
     GUIOuttextwin2 6,25,43,GUISoundText2b
 %endif
 ;.win32c
-    GUIOuttextwin2 6,25,105,GUISoundText4
+;    GUIOuttextwin2 6,25,105,GUISoundText4
     GUIOuttextwin2 6,25,115,GUISoundTextH
 ;    cmp byte[OSPort],3
 ;    je near .win32s
@@ -2266,11 +2266,11 @@ DisplayGUISound:
     GUIDisplayIconWin 6,11,39,[GUITemp]
 %endif
 ;.win32
-    mov dword[GUITemp],GUIIconDataCheckBoxUC
-    cmp byte[SoundNoiseDis],0
-    je .nocheckbox2
-    mov dword[GUITemp],GUIIconDataCheckBoxC
-.nocheckbox2
+;    mov dword[GUITemp],GUIIconDataCheckBoxUC
+;    cmp byte[SoundNoiseDis],0
+;    je .nocheckbox2
+;    mov dword[GUITemp],GUIIconDataCheckBoxC
+;.nocheckbox2
     GUIDisplayIconWin 6,11,101,[GUITemp]
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[RevStereo],0
@@ -2411,7 +2411,7 @@ GUISoundText1b db 'FORCE 8-BIT',0
 GUISoundText2 db 'SAMPLING RATE :',0
 GUISoundText2b db 'RAISE PITCH LEVEL',0
 GUISoundText3 db 'STEREO SOUND',0
-GUISoundText4 db 'DISABLE NOISE SIMULATION',0
+GUISoundText4 db '',0
 GUISoundText5 db 'VOLUME LEVEL :',0
 GUISoundText6 db 'SOUND SWITCHES :',0
 GUISoundText7 db ' 8000HZ',0