From f472a873581849157aa58d711f7bb89ea248ec88 Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Wed, 27 Feb 2002 04:00:58 +0000
Subject: [PATCH] Move most case to lower, since win/dos don't care, may have
 fixed the savestate bug also.

---
 zsnes/src/cpu/execute.asm   | 14 ------
 zsnes/src/gui/gui.asm       | 12 -----
 zsnes/src/gui/guicheat.inc  |  4 +-
 zsnes/src/gui/guikeys.inc   | 12 ++---
 zsnes/src/gui/guimisc.inc   |  4 --
 zsnes/src/gui/guimouse.inc  |  6 +--
 zsnes/src/gui/guiwindp.inc  | 10 +----
 zsnes/src/gui/menu.asm      | 62 --------------------------
 zsnes/src/init.asm          | 16 -------
 zsnes/src/ui.asm            | 88 -------------------------------------
 zsnes/src/vcache.asm        | 28 ------------
 zsnes/src/video/procvid.asm | 32 --------------
 12 files changed, 10 insertions(+), 278 deletions(-)

diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 57feaa10..d6d64a63 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -1521,11 +1521,7 @@ NEWSYM statesaver
     je .clearfirstinc
     mov eax,[statefileloc]
     mov dh,[fnamest+eax]
-%ifdef __LINUX__
     cmp dh,'t'
-%else
-    cmp dh,'T'
-%endif
     je .secondstate
     cmp dh,'9'
     je .jumptofirststate
@@ -1535,11 +1531,7 @@ NEWSYM statesaver
     mov dh,'1'
     jmp .donextstate
 .jumptofirststate
-%ifdef __LINUX__
     mov dh,'t'
-%else
-    mov dh,'T'
-%endif
 .donextstate
     mov byte[fnamest+eax],dh
     xor dh,dh
@@ -1661,11 +1653,8 @@ NEWSYM statesaver
     ; Get the state number
     mov ebx,[statefileloc]
     mov cl,[fnamest+ebx]
-    cmp cl,'T'
-    je  .stateiszero
     cmp cl,'t'
     jne .writewhichstate
-.stateiszero
     mov cl,'0'
 .writewhichstate
     mov [.savemsg+6],cl
@@ -1937,11 +1926,8 @@ NEWSYM loadstate
     ; Get the state number
     mov ebx,[statefileloc]
     mov cl,[fnamest+ebx]
-    cmp cl,'T'
-    je  .stateiszero
     cmp cl,'t'
     jne .writewhichstate
-.stateiszero
     mov cl,'0'
 .writewhichstate
     mov [.loadmsg+6],cl
diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index b5986066..85fdf5dc 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -3028,11 +3028,7 @@ MoviePlay:
     mov ebx,[statefileloc]
     mov eax,[fnamest+ebx-3]
     push eax
-%ifdef __LINUX__
     mov dword[fnamest+ebx-3],'.zmv'
-%else
-    mov dword[fnamest+ebx-3],'.ZMV'
-%endif
     mov al,[CMovieExt]
     mov byte[fnamest+ebx],al
     call ChangetoSRAMdir
@@ -3572,11 +3568,7 @@ SaveSecondState:
     call ChangetoSRAMdir
     mov ebx,[statefileloc]
     mov al,[fnamest+ebx]
-%ifdef __LINUX__
     mov byte[fnamest+ebx],'s'
-%else
-    mov byte[fnamest+ebx],'S'
-%endif
     push eax
     call statesaver
     pop eax
@@ -3589,11 +3581,7 @@ LoadSecondState:
     call ChangetoSRAMdir
     mov ebx,[statefileloc]
     mov al,[fnamest+ebx]
-%ifdef __LINUX__
     mov byte[fnamest+ebx],'s'
-%else
-    mov byte[fnamest+ebx],'S'
-%endif
     push eax
     call loadstate2
     pop eax
diff --git a/zsnes/src/gui/guicheat.inc b/zsnes/src/gui/guicheat.inc
index ed5b62fc..74c013c7 100644
--- a/zsnes/src/gui/guicheat.inc
+++ b/zsnes/src/gui/guicheat.inc
@@ -291,7 +291,7 @@ CheatCodeSave:
     mov ebx,[statefileloc]
     sub ebx,2
     mov eax,[fnamest+ebx]
-    mov dword[fnamest+ebx],'CHT'
+    mov dword[fnamest+ebx],'cht'
     push eax
     push ebx
     mov edx,fnamest+1
@@ -321,7 +321,7 @@ CheatCodeLoad:
     mov ebx,[statefileloc]
     sub ebx,2
     mov eax,[fnamest+ebx]
-    mov dword[fnamest+ebx],'CHT'
+    mov dword[fnamest+ebx],'cht'
     push eax
     push ebx
     mov edx,fnamest+1
diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index c444d052..6ba47a5e 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -2210,14 +2210,14 @@ GUIStateSelKeys:
 %endif
     mov ebx,[statefileloc]
     mov cl,[fnamest+ebx]
-    cmp cl,'T'
+    cmp cl,'t'
     jne .no1st
     mov cl,'4'
     jmp .done
 .no1st
     cmp cl,'1'
     jne .no2nd
-    mov cl,'T'
+    mov cl,'t'
     jmp .done
 .no2nd
     cmp cl,'5'
@@ -2242,14 +2242,14 @@ GUIStateSelKeys:
 %endif
     mov ebx,[statefileloc]
     mov cl,[fnamest+ebx]
-    cmp cl,'T'
+    cmp cl,'t'
     jne .noT
     mov cl,'1'
     jmp .done
 .noT
     cmp cl,'4'
     jne .no4th
-    mov cl,'T'
+    mov cl,'t'
     jmp .done
 .no4th
     cmp cl,'9'
@@ -2279,14 +2279,14 @@ GUIStateSelKeys:
 .vert
     mov ebx,[statefileloc]
     mov cl,[fnamest+ebx]
-    cmp cl,'T'
+    cmp cl,'t'
     jne .noTv
     mov cl,'5'
     jmp .done
 .noTv
     cmp cl,'5'
     jne .no5v
-    mov cl,'T'
+    mov cl,'t'
     jmp .done
 .no5v
     cmp cl,'5'
diff --git a/zsnes/src/gui/guimisc.inc b/zsnes/src/gui/guimisc.inc
index 006a8dcd..f9ba7981 100644
--- a/zsnes/src/gui/guimisc.inc
+++ b/zsnes/src/gui/guimisc.inc
@@ -28,11 +28,7 @@ MovieRecord:
     mov ebx,[statefileloc]
     mov eax,[fnamest+ebx-3]
     push eax
-%ifdef __LINUX__
     mov dword[fnamest+ebx-3],'.zmv'
-%else
-    mov dword[fnamest+ebx-3],'.ZMV'
-%endif
     mov al,[CMovieExt]
     mov byte[fnamest+ebx],al
 
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 173147cf..d3cc31b9 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -1922,7 +1922,7 @@ DisplayGUIConfirmClick:
     ret
 
 DisplayGUIChoseSaveClick:
-    GUIPButtonHole 10,28,byte[GUIChoseSaveText2],'T'
+    GUIPButtonHole 10,28,byte[GUIChoseSaveText2],'t'
     GUIPButtonHole 30,28,byte[GUIChoseSaveText2],'1'
     GUIPButtonHole 50,28,byte[GUIChoseSaveText2],'2'
     GUIPButtonHole 70,28,byte[GUIChoseSaveText2],'3'
@@ -1947,11 +1947,7 @@ DisplayGUIMovieClick:
     GUIPHoldbutton 7,17,49,28,16
     GUIPHoldbutton 7,33,49,44,17
     GUIPHoldbutton 7,49,49,60,18
-%ifdef __LINUX__
     GUIPButtonHole 60,25,byte[CMovieExt],'v'
-%else
-    GUIPButtonHole 60,25,byte[CMovieExt],'V'
-%endif
     GUIPButtonHole 80,25,byte[CMovieExt],'1'
     GUIPButtonHole 100,25,byte[CMovieExt],'2'
     GUIPButtonHole 120,25,byte[CMovieExt],'3'
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 658d6321..b603ac0a 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -970,7 +970,7 @@ DisplayGUIChoseSave:
     mov ebx,[statefileloc]
     mov al,byte[fnamest+ebx]
     mov [GUIChoseSaveText2],al
-    GUIDisplayButtonHole 2,10,28,byte[GUIChoseSaveText2],'T'
+    GUIDisplayButtonHole 2,10,28,byte[GUIChoseSaveText2],'t'
     GUIDisplayButtonHole 2,30,28,byte[GUIChoseSaveText2],'1'
     GUIDisplayButtonHole 2,50,28,byte[GUIChoseSaveText2],'2'
     GUIDisplayButtonHole 2,70,28,byte[GUIChoseSaveText2],'3'
@@ -5297,11 +5297,7 @@ DisplayGUIMovies:
     GUIOuttextwin2 15,70,57,GUIChoseSaveText2
     mov byte[GUIChoseSaveText2],'9'
     GUIOuttextwin2 15,90,57,GUIChoseSaveText2
-%ifdef __LINUX__
     GUIDisplayButtonHole 15,60,25,byte[CMovieExt],'v'
-%else
-    GUIDisplayButtonHole 15,60,25,byte[CMovieExt],'V'
-%endif
     GUIDisplayButtonHole 15,80,25,byte[CMovieExt],'1'
     GUIDisplayButtonHole 15,100,25,byte[CMovieExt],'2'
     GUIDisplayButtonHole 15,120,25,byte[CMovieExt],'3'
@@ -5323,11 +5319,7 @@ GUIMovieText7 db 'OKAY TO OVERWRITE?',0
 GUIMovieText8 db 'YES',0
 GUIMovieText9 db 'NO',0
 GUIMovieTextA db 'STATUS :           ',0
-%ifdef __LINUX__
 CMovieExt db 'v'
-%else
-CMovieExt db 'V'
-%endif
 
 ; Key types: Up, Down, Left, Right, A, B, X, Y, L, R (Press/Relase/P+R)
 ; Frame delays: 1 frame, 2, 3, 4, 5, 1 sec., 2, 3 ,4 ,5
diff --git a/zsnes/src/gui/menu.asm b/zsnes/src/gui/menu.asm
index 3e39f004..230d68f0 100644
--- a/zsnes/src/gui/menu.asm
+++ b/zsnes/src/gui/menu.asm
@@ -809,15 +809,9 @@ NEWSYM savespcdata
     cmp al,'.'
     jne .next
     ; Save stuff
-%ifdef __LINUX__
     mov byte[edi],'s'
     mov byte[edi+1],'p'
     mov byte[edi+2],'c'
-%else
-    mov byte[edi],'S'
-    mov byte[edi+1],'P'
-    mov byte[edi+2],'C'
-%endif
     mov byte[edi+3],0
     ; Find an unoccupied file
 .tryagainspc
@@ -826,11 +820,7 @@ NEWSYM savespcdata
     jc .nofileopen
     mov bx,ax
     call Close_File
-%ifdef __LINUX__
     cmp byte[edi+2],'c'
-%else
-    cmp byte[edi+2],'C'
-%endif
     jne .notc
     mov byte[edi+2],'1'
     jmp .tryagainspc
@@ -843,11 +833,7 @@ NEWSYM savespcdata
     mov al,[edi+1]
     cmp al,[edi+2]
     je .nofileopen
-%ifdef __LINUX__
     cmp byte[edi+1],'p'
-%else
-    cmp byte[edi+1],'P'
-%endif
     jne .notp
     mov byte[edi+1],'0'
 .notp
@@ -1114,15 +1100,9 @@ NEWSYM savepcx
 
     ; get unused filename
     mov byte[.filename+5],'.'
-%ifdef __LINUX__
     mov byte[.filename+6],'p'
     mov byte[.filename+7],'c'
     mov byte[.filename+8],'x'
-%else
-    mov byte[.filename+6],'P'
-    mov byte[.filename+7],'C'
-    mov byte[.filename+8],'X'
-%endif
     mov byte[.filename+9],0
     mov word[picnum],1
 .findagain
@@ -1168,15 +1148,9 @@ NEWSYM savepcx
     inc esi
 .finproc
     mov byte[esi],'.'
-%ifdef __LINUX__
     mov byte[esi+1],'p'
     mov byte[esi+2],'c'
     mov byte[esi+3],'x'
-%else
-    mov byte[esi+1],'P'
-    mov byte[esi+2],'C'
-    mov byte[esi+3],'X'
-%endif
     mov byte[esi+4],0
     jmp .findagain
 .nofile
@@ -1272,15 +1246,9 @@ NEWSYM savepcx
 
     ; get unused filename
     mov byte[.filename2+5],'.'
-%ifdef __LINUX__
     mov byte[.filename2+6],'b'
     mov byte[.filename2+7],'m'
     mov byte[.filename2+8],'p'
-%else
-    mov byte[.filename2+6],'B'
-    mov byte[.filename2+7],'M'
-    mov byte[.filename2+8],'P'
-%endif
     mov byte[.filename2+9],0
     mov word[picnum],1
 .findagain2
@@ -1326,15 +1294,9 @@ NEWSYM savepcx
     inc esi
 .finproc2
     mov byte[esi],'.'
-%ifdef __LINUX__
     mov byte[esi+1],'b'
     mov byte[esi+2],'m'
     mov byte[esi+3],'p'
-%else
-    mov byte[esi+1],'B'
-    mov byte[esi+2],'M'
-    mov byte[esi+3],'P'
-%endif
     mov byte[esi+4],0
     jmp .findagain2
 .nofile2
@@ -1403,17 +1365,9 @@ NEWSYM savepcx
     ret
 
 .pcxsaved db 'SNAPSHOT SAVED TO '
-%ifdef __LINUX__
 .filename db 'image.pcx',0,0,0,0
-%else
-.filename db 'IMAGE.PCX',0,0,0,0
-%endif
 .rawsaved db 'SNAPSHOT SAVED TO '
-%ifdef __LINUX__
 .filename2 db 'image.bmp',0,0,0,0
-%else
-.filename2 db 'IMAGE.BMP',0,0,0,0
-%endif
 .rowsleft db 0
 .curdptr dd 0
 
@@ -1441,15 +1395,9 @@ NEWSYM save16b2
 
     ; get unused filename
     mov byte[.filename2+5],'.'
-%ifdef __LINUX__
     mov byte[.filename2+6],'b'
     mov byte[.filename2+7],'m'
     mov byte[.filename2+8],'p'
-%else
-    mov byte[.filename2+6],'B'
-    mov byte[.filename2+7],'M'
-    mov byte[.filename2+8],'P'
-%endif
     mov byte[.filename2+9],0
     mov word[picnum],1
 .findagain2
@@ -1495,15 +1443,9 @@ NEWSYM save16b2
     inc esi
 .finproc2
     mov byte[esi],'.'
-%ifdef __LINUX__
     mov byte[esi+1],'b'
     mov byte[esi+2],'m'
     mov byte[esi+3],'p'
-%else
-    mov byte[esi+1],'B'
-    mov byte[esi+2],'M'
-    mov byte[esi+3],'P'
-%endif
     mov byte[esi+4],0
     jmp .findagain2
 .nofile2
@@ -1570,11 +1512,7 @@ NEWSYM save16b2
     ret
 
 .rawsaved db 'SNAPSHOT SAVED TO '
-%ifdef __LINUX__
 .filename2 db 'image.bmp',0,0,0,0
-%else
-.filename2 db 'IMAGE.BMP',0,0,0,0
-%endif
 .rowsleft dd 0
 .curdptr dd 0
 
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 720d59a1..357fc0b9 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -3596,11 +3596,7 @@ NEWSYM PatchIPS
 .foundokay
     mov ebx,[eax]
     mov [Prevextn],ebx
-%ifdef __LINUX__
     mov dword[eax],'.ips'
-%else
-    mov dword[eax],'.IPS'
-%endif
     mov byte[eax+4],0
     push eax
 %ifdef __LINUX__
@@ -3749,11 +3745,7 @@ OpenCombFile:
     je .found2
     jmp .found
 .found2
-%ifdef __LINUX__
     mov dword[edx],'.cmb'
-%else
-    mov dword[edx],'.CMB'
-%endif
     push edx
     mov dword[NumComboLocl],0
     mov edx,fnames+1
@@ -3778,11 +3770,7 @@ OpenCombFile:
     call Close_File
 .failb
     pop edx
-%ifdef __LINUX__
     mov dword[edx],'.srm'
-%else
-    mov dword[edx],'.SRM'
-%endif
     ret
 
 NEWSYM SaveCombFile
@@ -3823,11 +3811,7 @@ NEWSYM SaveCombFile
     call Close_File
 .failb
     pop edx
-%ifdef __LINUX__
     mov dword[edx],'.srm'
-%else
-    mov dword[edx],'.SRM'
-%endif
 .notfound
     ret
 
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 031c30af..b9ed2ccf 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -399,7 +399,6 @@ NEWSYM getcmdline
     jmp .next2
 .nomore
     mov [FilenameStart],esi
-%ifdef __LINUX__
     mov byte[esi],'z'
     mov byte[esi+1],'s'
     mov byte[esi+2],'n'
@@ -431,46 +430,12 @@ NEWSYM getcmdline
     mov byte[esi+6+512],'m'
     mov byte[esi+7+512],'b'
     mov byte[esI+8+512],0
-%else
-    mov byte[esi],'Z'
-    mov byte[esi+1],'S'
-    mov byte[esi+2],'N'
-    mov byte[esi+3],'E'
-    mov byte[esi+4],'S'
-    mov byte[esi+5],'.'
-    mov byte[esi+6],'C'
-    mov byte[esi+7],'F'
-    mov byte[esi+8],'G'
-    mov byte[esi+9],0
-    mov byte[esi+256],'Z'
-    mov byte[esi+1+256],'G'
-    mov byte[esi+2+256],'U'
-    mov byte[esi+3+256],'I'
-    mov byte[esi+4+256],'C'
-    mov byte[esi+5+256],'F'
-    mov byte[esi+6+256],'G'
-    mov byte[esi+7+256],'.'
-    mov byte[esi+8+256],'D'
-    mov byte[esi+9+256],'A'
-    mov byte[esi+10+256],'T'
-    mov byte[esi+11+256],0
-    mov byte[esi+512],'D'
-    mov byte[esi+1+512],'A'
-    mov byte[esi+2+512],'T'
-    mov byte[esi+3+512],'A'
-    mov byte[esi+4+512],'.'
-    mov byte[esi+5+512],'C'
-    mov byte[esi+6+512],'M'
-    mov byte[esi+7+512],'B'
-    mov byte[esI+8+512],0
-%endif
     ret
 .nfound
     mov edx,.stringnf
     call PrintStr
     mov esi,CMDLineStr
     mov [FilenameStart],esi
-%ifdef __LINUX__
     mov byte[esi],'z'
     mov byte[esi+1],'s'
     mov byte[esi+2],'n'
@@ -502,39 +467,6 @@ NEWSYM getcmdline
     mov byte[esi+6+512],'m'
     mov byte[esi+7+512],'b'
     mov byte[esI+8+512],0
-%else
-    mov byte[esi],'Z'
-    mov byte[esi+1],'S'
-    mov byte[esi+2],'N'
-    mov byte[esi+3],'E'
-    mov byte[esi+4],'S'
-    mov byte[esi+5],'.'
-    mov byte[esi+6],'C'
-    mov byte[esi+7],'F'
-    mov byte[esi+8],'G'
-    mov byte[esi+9],0
-    mov byte[esi+256],'Z'
-    mov byte[esi+1+256],'G'
-    mov byte[esi+2+256],'U'
-    mov byte[esi+3+256],'I'
-    mov byte[esi+4+256],'C'
-    mov byte[esi+5+256],'F'
-    mov byte[esi+6+256],'G'
-    mov byte[esi+7+256],'.'
-    mov byte[esi+8+256],'D'
-    mov byte[esi+9+256],'A'
-    mov byte[esi+10+256],'T'
-    mov byte[esi+11+256],0
-    mov byte[esi+512],'D'
-    mov byte[esi+1+512],'A'
-    mov byte[esi+2+512],'T'
-    mov byte[esi+3+512],'A'
-    mov byte[esi+4+512],'.'
-    mov byte[esi+5+512],'C'
-    mov byte[esi+6+512],'M'
-    mov byte[esi+7+512],'B'
-    mov byte[esI+8+512],0
-%endif
     ret
 
 SECTION .data
@@ -1231,7 +1163,6 @@ NEWSYM makeextension
     mov byte[fnames+ebx],'.'
     mov byte[fnamest+ebx],'.'
     inc ebx
-%ifdef __LINUX__
     mov byte[fnames+ebx],'s'
     mov byte[fnamest+ebx],'z'
     inc ebx
@@ -1241,17 +1172,6 @@ NEWSYM makeextension
     mov byte[fnames+ebx],'m'
     mov byte[fnamest+ebx],'t'
     mov dword[statefileloc],ebx
-%else
-    mov byte[fnames+ebx],'S'
-    mov byte[fnamest+ebx],'Z'
-    inc ebx
-    mov byte[fnames+ebx],'R'
-    mov byte[fnamest+ebx],'S'
-    inc ebx
-    mov byte[fnames+ebx],'M'
-    mov byte[fnamest+ebx],'T'
-    mov dword[statefileloc],ebx
-%endif
     inc ebx
     mov byte[fnames+ebx],0
     mov byte[fnamest+ebx],0
@@ -1321,11 +1241,7 @@ DetermineNewest:
     mov eax,[statefileloc]
     mov dword[newestfiledate],0
     mov byte[newestfileloc],0
-%ifdef __LINUX__
     determinenewhelp 0,'t'
-%else
-    determinenewhelp 0,'T'
-%endif
     determinenewhelp 1,'1'
     determinenewhelp 2,'2'
     determinenewhelp 3,'3'
@@ -1339,11 +1255,7 @@ DetermineNewest:
     add bl,'0'
     cmp bl,'0'
     jne .nott
-%ifdef __LINUX__
     mov bl,'t'
-%else
-    mov bl,'T'
-%endif
 .nott
     mov [fnamest+eax],bl
     ret
diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm
index fec811b4..ba0c4789 100644
--- a/zsnes/src/vcache.asm
+++ b/zsnes/src/vcache.asm
@@ -697,11 +697,7 @@ NEWSYM cachevideo
 .nodisplayfps
 
     ; do state selects
-%ifdef __LINUX__
     stateselcomp KeyStateSlc0,'0','t'
-%else
-    stateselcomp KeyStateSlc0,'0','T'
-%endif
     stateselcomp KeyStateSlc1,'1','1'
     stateselcomp KeyStateSlc2,'2','2'
     stateselcomp KeyStateSlc3,'3','3'
@@ -727,11 +723,7 @@ NEWSYM cachevideo
     mov byte[pressed+eax],2
     mov eax,[statefileloc]
     mov dh,[fnamest+eax]
-%ifdef __LINUX__
     cmp dh,'t'
-%else
-    cmp dh,'T'
-%endif
     je .secondstate
     cmp dh,'9'
     je .jumptofirststate
@@ -741,18 +733,10 @@ NEWSYM cachevideo
     mov dh,'1'
     jmp .donextstate
 .jumptofirststate
-%ifdef __LINUX__
     mov dh,'t'
-%else
-    mov dh,'T'
-%endif
 .donextstate
     mov byte[fnamest+eax],dh
-%ifdef __LINUX__
     cmp dh,'t'
-%else
-    cmp dh,'T'
-%endif
     je .firststatemsg
     mov byte[sselm+11],dh
     jmp .incstatemsg
@@ -771,31 +755,19 @@ NEWSYM cachevideo
     mov byte[pressed+eax],2
     mov eax,[statefileloc]
     mov dh,[fnamest+eax]
-%ifdef __LINUX__
     cmp dh,'t'
-%else
-    cmp dh,'T'
-%endif
     je .jumptolaststate
     dec dh
     cmp dh,'0'
     jne .doprevstate
 .firststate
-%ifdef __LINUX__
     mov dh,'t'
-%else
-    mov dh,'T'
-%endif
     jmp .doprevstate
 .jumptolaststate
     mov dh,'9'
 .doprevstate
     mov byte[fnamest+eax],dh
-%ifdef __LINUX__
     cmp dh,'t'
-%else
-    cmp dh,'T'
-%endif
     je .firststatemsg2
     mov byte[sselm+11],dh
     jmp .decstatemsg
diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm
index 5e81f263..d6ec0ff2 100644
--- a/zsnes/src/video/procvid.asm
+++ b/zsnes/src/video/procvid.asm
@@ -1235,11 +1235,7 @@ DetermineNewest:
     mov dword[newestfiledate],0
     mov byte[newestfileloc],0
 
-%ifdef __LINUX__
     determinenewhelp 0,'t'
-%else
-    determinenewhelp 0,'T'
-%endif
     determinenewhelp 1,'1'
     determinenewhelp 2,'2'
     determinenewhelp 3,'3'
@@ -1629,11 +1625,7 @@ NEWSYM saveselect
     mov bl,byte[fnamest+eax]
     push ebx
     call DetermineNewest
-%ifdef __LINUX__
     drawfillboxhelp 0,'t'
-%else
-    drawfillboxhelp 0,'T'
-%endif
     drawfillboxhelp 1,'1'
     drawfillboxhelp 2,'2'
     drawfillboxhelp 3,'3'
@@ -1722,11 +1714,7 @@ NEWSYM saveselect
     mov bl,0
     mov ebx,[statefileloc]
     mov al,byte[fnamest+ebx]
-%ifdef __LINUX__
     cmp al,'t'
-%else
-    cmp al,'T'
-%endif
     jne .noT
     mov bl,0
     jmp .nexter
@@ -1784,11 +1772,7 @@ NEWSYM saveselect
     mov byte[pressed+28],2
     cmp bl,0
     jne .nozero
-%ifdef __LINUX__
     mov al,'t'
-%else
-    mov al,'T'
-%endif
     jmp .save
 .nozero
     add bl,48
@@ -1909,11 +1893,7 @@ NEWSYM saveselect
     mov bl,byte[fnamest+eax]
     push ebx
     call DetermineNewest
-%ifdef __LINUX__
     drawfillboxhelp16b 0,'t'
-%else
-    drawfillboxhelp16b 0,'T'
-%endif
     drawfillboxhelp16b 1,'1'
     drawfillboxhelp16b 2,'2'
     drawfillboxhelp16b 3,'3'
@@ -2003,11 +1983,7 @@ NEWSYM saveselect
     mov bl,0
     mov ebx,[statefileloc]
     mov al,byte[fnamest+ebx]
-%ifdef __LINUX__
     cmp al,'t'
-%else
-    cmp al,'T'
-%endif
     jne .noT16b
     mov bl,0
     jmp .nexter16b
@@ -2036,11 +2012,7 @@ NEWSYM saveselect
     push ecx
     cmp bl,0
     jne .nozero16b2
-%ifdef __LINUX__
     mov cl,'t'
-%else
-    mov cl,'T'
-%endif
     jmp .save16b2
 .nozero16b2
     mov cl,bl
@@ -2106,11 +2078,7 @@ NEWSYM saveselect
     mov byte[pressed+28],2
     cmp bl,0
     jne .nozero16b
-%ifdef __LINUX__
     mov al,'t'
-%else
-    mov al,'T'
-%endif
     jmp .save16b
 .nozero16b
     add bl,48