Move most case to lower, since win/dos don't care, may have fixed the savestate

bug also.
2002-02-27 04:00:58 +00:00
parent 901c8def98
commit f472a87358
12 changed files with 10 additions and 278 deletions
--- 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
--- 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
--- 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'
--- 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

--- 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'
--- 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
--- 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