From eec1b6400d941a3ac16c90f1dcb669bb1584587d Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Sat, 22 Nov 2003 21:03:03 +0000
Subject: [PATCH] Some small GUI cleanup

---
 zsnes/src/gui/gui.asm      |  2 +-
 zsnes/src/gui/guikeys.inc  |  8 --------
 zsnes/src/gui/guimouse.inc |  6 ------
 zsnes/src/gui/guiwindp.inc | 22 +---------------------
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index bad2353a..c675c882 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -602,7 +602,7 @@ NEWSYM KeyIncStateSlot, dd 0
 NEWSYM KeyDecStateSlot, dd 0
 NEWSYM KeyUsePlayer1234, dd 0
 NEWSYM hq3xFilter, db 0
-NEWSYM RESERVED, db 0
+NEWSYM reserved, db 0
 NEWSYM scale2xFilter, db 0
 
 GUIsave equ $-GUIRAdd
diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index df40d37d..160a4ed0 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -1238,14 +1238,6 @@ GUIVideoKeys:
 ;    mov byte[Triplebufen],0
 %endif
 .novsync
-;    cmp dh,'K'
-;    jne .nokitchensync
-;    xor ebx,ebx
-;    mov bl,[cvidmode]
-;    cmp byte[GUITBWVID+ebx],0
-;    je .nokitchensync
-;    xor byte[KitchenSync],1
-;.nokitchensync
 %endif
     ret
 
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 1ee2628d..c05e4792 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2325,12 +2325,6 @@ DisplayGUIVideoClick:
     je .nocheckboxttb
     GUIClickCButtonT 11,163,byte[Triplebufen],byte[vsyncon]
 .nocheckboxttb
-;    xor ebx,ebx
-;    mov bl,[cvidmode]
-;    cmp byte[GUITBWVID+ebx],0
-;    je .nocheckboxks
-;    GUIClickCButton 83,173,byte[KitchenSync]
-;.nocheckboxks
     GUIClickCButton 11,183,byte[GrayscaleMode]
 %ifdef __WIN32__
     GUIClickCButtonf 115,183,byte[vsyncon],initDirectDraw
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 213ec560..18885a52 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -1758,10 +1758,6 @@ DisplayGUIVideo:
     je .notext7
     GUIOuttextwin2u 5,26,168,GUIVideoText7,0
 .notext7
-;    cmp byte[GUITBWVID+eax],0
-;    je .notext77
-;    GUIOuttextwin2u 5,96,178,GUIVideoText10,0
-;.notext77
     xor eax,eax
     mov al,[cvidmode]
     cmp byte[GUIM7VID+eax],0
@@ -1875,10 +1871,6 @@ DisplayGUIVideo:
     je .notext7b
     GUIOuttextwin2 5,25,167,GUIVideoText7
 .notext7b
-;    cmp byte[GUITBWVID+eax],0
-;    je .notext7c
-;    GUIOuttextwin2 5,95,177,GUIVideoText10
-;.notext7c
     xor eax,eax
     mov al,[cvidmode]
     cmp byte[GUIM7VID+eax],0
@@ -2038,17 +2030,6 @@ DisplayGUIVideo:
 .nocheckboxm74
     GUIDisplayIconWin 5,115,183,[GUITemp]
 %endif
-;    xor eax,eax
-;    mov al,[cvidmode]
-;    cmp byte[GUITBWVID+eax],0
-;    je .nocheckboxks2
-;    mov dword[GUITemp],GUIIconDataCheckBoxUC
-;    cmp byte[KitchenSync],0
-;    je .nocheckboxks
-;    mov dword[GUITemp],GUIIconDataCheckBoxC
-;.nocheckboxks
-;    GUIDisplayIconWin 5,83,173,[GUITemp]
-;.nocheckboxks2
     xor eax,eax
     mov al,[cvidmode]
     cmp byte[GUIIEVID+eax],0
@@ -2229,11 +2210,10 @@ GUIVideoText5 db 'FULL SCREEN',0        ; -c
 GUIVideoText5b db 'WIDE SCREEN',0        ; -c
 GUIVideoText6 db 'SMALL SCREEN',0       ; -c
 GUIVideoText7 db 'TRIPLE BUFFERING',0       ; -c
-GUIVideoText8b db 'HI-RES M7',0       ; -c
+GUIVideoText8b db 'HI-RES MODE 7',0       ; -c
 GUIVideoText8c db 'GRAYSCALE MODE',0       ; -c
 GUIVideoText8 db 'SET',0                ; set button
 GUIVideoText9 db 'VSYNC',0       ; -c
-;GUIVideoText10 db 'KITCHENSYNC',0       ; -c
 GUIVideoTextH db 'MODE : ',0
 GUIVideoTextw0 db 'LEGEND:',0
 GUIVideoTextw1 db ' S = SCALED TO FIT SCREEN',0