diff --git a/zsnes/src/cpu/dspproc.asm b/zsnes/src/cpu/dspproc.asm index 50319f0e..37ae8c41 100644 --- a/zsnes/src/cpu/dspproc.asm +++ b/zsnes/src/cpu/dspproc.asm @@ -1484,7 +1484,7 @@ NEWSYM InitSPC cmp byte[soundon],0 ; je near .nosound cmp byte[OSPort],2 - ja near .nosound + jae near .nosound mov ax,0100h ; Allocate DOS memory mov bx,16384/16 ; Allocate 16384 bytes diff --git a/zsnes/src/gui/menu.asm b/zsnes/src/gui/menu.asm index 89965fc3..e0dd19d7 100644 --- a/zsnes/src/gui/menu.asm +++ b/zsnes/src/gui/menu.asm @@ -998,9 +998,15 @@ 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 @@ -1046,9 +1052,15 @@ 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 @@ -1144,9 +1156,15 @@ 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 @@ -1192,9 +1210,15 @@ 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 @@ -1263,9 +1287,17 @@ 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 @@ -1293,9 +1325,15 @@ 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 @@ -1341,9 +1379,15 @@ 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 @@ -1410,7 +1454,11 @@ 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/linux/winintrf.asm b/zsnes/src/linux/winintrf.asm index 45751174..047868e0 100644 --- a/zsnes/src/linux/winintrf.asm +++ b/zsnes/src/linux/winintrf.asm @@ -224,10 +224,17 @@ NEWSYM SystemInit mov byte[pl1selk],54 mov byte[pl1startk],28 ; 1START = ENTER +%ifdef __LINUX__ + mov byte[pl1upk],90 ; 1UP = up + mov byte[pl1downk],96 ; 1DOWN = down + mov byte[pl1leftk],92 ; 1LEFT = left + mov byte[pl1rightk],94 ; 1RIGHT = right +%else mov byte[pl1upk],200 ; 1UP = up mov byte[pl1downk],208 ; 1DOWN = down mov byte[pl1leftk],203 ; 1LEFT = left mov byte[pl1rightk],205 ; 1RIGHT = right +%endif mov byte[pl1Xk],31 ; 1X = INS mov byte[pl1Ak],45 ; 1A = HOME mov byte[pl1Lk],32 ; 1L = PAGE UP @@ -1759,10 +1766,17 @@ NEWSYM SetInputDevice je near .input2 mov dword[eax],54 mov dword[eax+4],28 +%ifdef __LINUX__ + mov dword[eax+8],90 + mov dword[eax+12],96 + mov dword[eax+16],92 + mov dword[eax+20],94 +%else mov dword[eax+8],200 mov dword[eax+12],208 mov dword[eax+16],203 mov dword[eax+20],205 +%endif mov dword[eax+24],31 mov dword[eax+28],45 mov dword[eax+32],32