From 820bac66ee749d09d0510e15a8d3048f364a9b07 Mon Sep 17 00:00:00 2001
From: ipher <>
Date: Fri, 13 May 2005 11:54:39 +0000
Subject: [PATCH] Lets try this one last time...

---
 zsnes/src/gui/gui.asm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 8639c550..14855533 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -155,7 +155,6 @@ NEWSYM WaterOn,  db 1
 ;                Sound
 ;                Paths
 ;                Saves
-;                Speed
 
 ; MultiPlay only has "Internet" for Windows/Linux
 
@@ -179,12 +178,11 @@ NEWSYM WaterOn,  db 1
 ;           18 = Chip Config
 ;           19 = Paths
 ;           20 = Saves
-;           21 = Speed
 
 ;The first byte is the number of fields on the right not including the seperators
 MenuDat1 db 12, 3,1,1,1,1,1,1,1,1,1,0,1,2,0
 MenuDat2 db 8,  3,1,1,0,1,1,1,0,2,0,0
-MenuDat3 db 14, 3,1,1,1,1,0,1,1,0,1,1,1,1,1,2,0
+MenuDat3 db 13, 3,1,1,1,1,0,1,1,0,1,1,1,1,2,0
 MenuDat4 db 2,  3,1,2,0
 MenuDat5 db 1,  3,2,0
 MenuDat6 db 6,  3,1,1,1,1,0,2,0
@@ -228,7 +226,6 @@ GUIConfigMenuData
         db 1,'SOUND       ',0
         db 1,'PATHS       ',0
         db 1,'SAVES       ',0
-        db 1,'SPEED       ',0
 GUICheatMenuData
         db 1,'ADD CODE    ',0
         db 1,'BROWSE      ',0
@@ -1169,9 +1166,9 @@ LoadDetermine:
     mov byte[GUICheatMenuData+14],1
     mov byte[GUICheatMenuData+14*2],1
     mov byte[GUIMiscMenuData+14*2],1
-    mov byte[GUINetPlayMenuData],2         ; Grays out the Internet option.
+    mov byte[GUINetPlayMenuData],2             ; Gray out Netplay options
 %ifdef __MSDOS__
-    mov byte[GUINetPlayMenuData+14],2      ; Grays out second Netplay option for DOS
+    mov byte[GUINetPlayMenuData+14],2          
 %endif
     cmp byte[romloadskip],0
     je .noromloaded
@@ -2630,7 +2627,6 @@ GUITryMenuItem:
     GUICheckMenuItem 6, 11             ; Sound
     GUICheckMenuItem 19, 12            ; Paths
     GUICheckMenuItem 20, 13            ; Saves
-    GUICheckMenuItem 21, 14            ; Speed
 .noconfig
     cmp byte[romloadskip],0
     jne near .nocheat
@@ -2651,11 +2647,11 @@ GUITryMenuItem:
     cmp byte[GUIcmenupos],5
     jne near .nonet
 %ifdef __MSDOS__
-;    GUICheckMenuItem 8, 0             ; Disable DOS Netplay options
+;    GUICheckMenuItem 8, 0        ; Disable DOS Netplay Options
 ;    GUICheckMenuItem 8, 1
 %endif
-;.win32      ; Already commented out
-;    GUICheckMenuItem 8, 0             ; Now for WIN/SDL
+;.win32                           ; Already commented
+;    GUICheckMenuItem 8, 0        ; Disable WIN/SDL Internet Option
     cmp byte[GUIcrowpos],0
     jne near .nonet
 .nonet
@@ -2823,11 +2819,6 @@ DisplayBoxes:
     call DisplayGUISave
     jmp .finstuff
 .nosave
-    cmp al,21
-    jne .nospeed
-    call DisplayGUISpeed
-    jmp .finstuff
-.nospeed
 .finstuff
     pop esi
     inc esi