From 77ed1015e88699009f6d9aee675831644edd6c79 Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Thu, 23 May 2002 00:05:14 +0000
Subject: [PATCH] Moved ZVERSION to somewhere useful Removed hacked in version
 changing in the about box Removed URL to zsnes.com in Linux about box Removed
 version number on the Linux port Fixed ipher's typo for real this time

---
 zsnes/src/gui/gui.asm      | 10 ----------
 zsnes/src/gui/guiwindp.inc | 26 ++++----------------------
 zsnes/src/macros.mac       |  2 ++
 zsnes/src/ui.asm           |  4 +---
 4 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index febf7c72..215fe969 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -1683,12 +1683,6 @@ NEWSYM StartGUI
     mov byte[OkaySC],1
 .noxmas
     mov byte[lastmouseholded],1
-    mov eax,[welcome+8]
-    mov [GUIGUIAboutText1+8],eax
-    mov al,[welcome+12]
-    mov [GUIGUIAboutText1+12],al
-    mov al,[welcome+7]
-    mov [GUIGUIAboutText1+7],al
     cmp dword[GUIwinposx+15*4],0
     jne .nomoviemenufix
     mov dword[GUIwinposx+15*4],50
@@ -1699,10 +1693,6 @@ NEWSYM StartGUI
     mov word[resolutn],224
 
     mov byte[GUIPalConv],0
-    mov byte[GUIGUIAboutText1],'Z'-86
-    add byte[GUIGUIAboutText1],86
-    mov byte[GUIGUIAboutText1+3],'E'-89
-    add byte[GUIGUIAboutText1+3],89
     mov byte[MousePRClick],1
 
     pushad
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 0209e31d..bdf7cad8 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -16,8 +16,6 @@
 ;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-
-
 ; Window Display Routines
 ; Last button value used = 65
 
@@ -2975,7 +2973,7 @@ CheatSearching:
     jmp DisplayChtSrcRes
 
 CheatSearchingComp:
-    ; Comparitive search
+    ; Comparative search
     mov al,[GUIWincol]
     mov byte[GUItextcolor],al
     GUIOuttextwin2 13,6,16,GUICSrcTextE
@@ -3450,7 +3448,7 @@ GUICSrcText6 db 'DEC (BASE 10)',0
 GUICSrcText7 db 'HEX (BASE 16)',0
 GUICSrcText8 db 'SELECT SEARCH TYPE:',0
 GUICSrcText9 db 'EXACT VALUE SEARCH',0
-GUICSrcTextA db 'COMPARITIVE SEARCH',0
+GUICSrcTextA db 'COMPARATIVE SEARCH',0
 GUICSrcTextB db 'START',0
 GUICSrcTextD db 'ENTER VALUE:',0
 GUICSrcTextE db 'SELECT COMPARISON:',0
@@ -5103,30 +5101,14 @@ GUIGUIOptnsTextM db 'FILTERED GUI',0
 GUIGUIOptnsTextN db 'TRAP MOUSE CURSOR',0
 
 DisplayGUIAbout:
-;    cmp byte[OSPort],3
-;    jne .notwin32
-;.notwin32
-    mov byte[GUIGUIAboutText1+1],'S'+136
-    mov byte[GUIGUIAboutText1+2],'N'-26
-    add byte[GUIGUIAboutText1+2],26
-    sub byte[GUIGUIAboutText1+1],136
-    mov byte[GUIGUIAboutText1+4],'S'-97
     GUIDrawWindowBox 11,GUIAboutDisp
     mov byte[GUItextcolor],217
     cmp byte[GUIWincoladd],0
     je .zero3
     mov byte[GUItextcolor],211
 .zero3
-    add byte[GUIGUIAboutText1+4],97
-;    cmp byte[OSPort],3
-;    je near .win32
 %ifndef __LINUX__
     DrawGUIButton 11,90,50,175,60,GUIGUIAboutText8,65,0,0
-%else
-    sub byte[GUItextcolor],15
-    GUIOuttextwin2 11,6,126,GUIGUIAboutText8
-    add byte[GUItextcolor],15
-    GUIOuttextwin2 11,5,125,GUIGUIAboutText8
 %endif
     sub byte[GUItextcolor],15
     GUIOuttextwin2 11,6,16,GUIGUIAboutText1
@@ -5175,7 +5157,7 @@ DisplayGUIAbout:
     GUIOuttextwin2 11,5,75,GUIGUIAboutText5
     ret
 
-GUIGUIAboutText1 db 'ZSNES V0.Agh  ',0
+GUIGUIAboutText1 db 'ZSNES V',ZVERSION,0
 GUIGUIAboutText2 db 'CODED BY :  ',0
 GUIGUIAboutText3 db '    ZSKNIGHT',0
 GUIGUIAboutText4 db '    _DEMO_',0
@@ -5191,7 +5173,7 @@ GUIGUIAboutText7 db 'DOS VERSION',0
 %elifdef __WIN32__
 GUIGUIAboutText7 db 'WIN PORT V1.06',0
 %elifdef __LINUX__
-GUIGUIAboutText7 db 'LINUX PORT V0.37',0
+GUIGUIAboutText7 db 'LINUX VERSION',0
 %endif
 
 GUIGUIAboutText8 db 'WWW.ZSNES.COM',0
diff --git a/zsnes/src/macros.mac b/zsnes/src/macros.mac
index d47bb529..9baacd06 100644
--- a/zsnes/src/macros.mac
+++ b/zsnes/src/macros.mac
@@ -20,6 +20,8 @@ bits 32
 section .text
 ; Zsnes required macros
 
+%define ZVERSION '1.337'
+
 %ifdef __LINUX__
 %imacro newsym 1
   GLOBAL %1
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 75e608b0..3cb93f62 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -138,8 +138,6 @@ NEWSYM	outofmemory
 SECTION .data
 NEWSYM mydebug, db '',13,10,0
 NEWSYM outofmem, db 'You don',39,'t have enough memory to run this program!',13,10,0
-%define ZVERSION '337'
-;%define ZBETA    0
 
 ; Line added by Peter Santing
 NEWSYM vibradetect
@@ -150,7 +148,7 @@ NEWSYM vibradetect
 NEWSYM welcome
 
 
-                 db 'ZSNES v1.',ZVERSION,' beta (c) 1997-2002, ZSNES Team (zsKnight & _Demo_)',13,10
+                 db 'ZSNES v',ZVERSION,' (c) 1997-2002, ZSNES Team (zsKnight & _Demo_)',13,10
 %ifdef __LINUX__
                  db 'Compiled under NASM and GCC. (*nix)',13,10,13,10
 %else