diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm index cce2173e..69f24e35 100644 --- a/zsnes/src/cfgload.asm +++ b/zsnes/src/cfgload.asm @@ -582,7 +582,7 @@ db '',13,10 ;db 'CopyMethod = %o',13,10 ;db '',13,10 %ifdef __WIN32__ -db '; Video Mode, 0 - 21',13,10 +db '; Video Mode, 0 - 23',13,10 db '; 0 = 64x56 R WIN 1 = 128x112 R WIN',13,10 db '; 2 = 256X224 R WIN 3 = 256x224 R FULL',13,10 db '; 4 = 512X448 R WIN 5 = 512X448 DR WIN',13,10 @@ -594,6 +594,7 @@ db '; 14 = 1024X768 S WIN 15 = 1024X768 DS WIN',13,10 db '; 16 = 1024x768 S FULL 17 = 1024x768 DS FULL',13,10 db '; 18 = 768x672 R WIN 19 = 768x672 DR WIN',13,10 db '; 20 = 1024x896 R WIN 21 = 1024x896 DR WIN',13,10 +db '; 22 = 1280x960 DR FULL 23 = 1280x960 DS FULL',13,10 db '',13,10 db 'VideoMode = %U',13,10 db '',13,10 diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm index 7b748ac6..6b2ce180 100644 --- a/zsnes/src/win/winintrf.asm +++ b/zsnes/src/win/winintrf.asm @@ -1250,55 +1250,57 @@ NEWSYM ClearScreen SECTION .data ; Total Number of Video Modes -NEWSYM NumVideoModes, dd 22 +NEWSYM NumVideoModes, dd 24 ; GUI Video Mode Names - Make sure that all names are of the same length ; and end with a NULL terminator NEWSYM GUIVideoModeNames db '64x56 R WIN ',0 ;0 db '128x112 R WIN ',0 ;1 -db '256X224 R WIN ',0 ;2 +db '256x224 R WIN ',0 ;2 db '256x224 R FULL',0 ;3 -db '512X448 R WIN ',0 ;4 -db '512X448 DR WIN ',0 ;5 +db '512x448 R WIN ',0 ;4 +db '512x448 DR WIN ',0 ;5 db '640x480 S WIN ',0 ;6 db '640x480 DR FULL',0 ;7 -db '640X480 DS FULL',0 ;8 -db '640X480 S FULL',0 ;9 +db '640x480 DS FULL',0 ;8 +db '640x480 S FULL',0 ;9 db '800x600 S WIN ',0 ;10 db '800x600 DS WIN ',0 ;11 db '800x600 S FULL',0 ;12 db '800x600 DS FULL',0 ;13 -db '1024X768 S WIN ',0 ;14 -db '1024X768 DS WIN ',0 ;15 +db '1024x768 S WIN ',0 ;14 +db '1024x768 DS WIN ',0 ;15 db '1024x768 S FULL',0 ;16 db '1024x768 DS FULL',0 ;17 db '768x672 R WIN ',0 ;18 db '768x672 DR WIN ',0 ;19 db '1024x896 R WIN ',0 ;20 db '1024x896 DR WIN ',0 ;21 +db '1280x960 DR FULL',0 ;22 +db '1280x960 DS FULL',0 ;23 ; Video Mode Feature Availability (1 = Available, 0 = Not Available) ; Left side starts with Video Mode 0 -NEWSYM GUI16VID, db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 ; 16-bit mode -NEWSYM GUINGVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; New Graphics Mode Available -NEWSYM GUISLVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Scanlines -NEWSYM GUIINVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Interpolation -NEWSYM GUII2VID, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1 ; Interpolation(w) -NEWSYM GUIEAVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Eagle -NEWSYM GUIIEVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; (Interp | Eagle) -NEWSYM GUIFSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Full Screen -NEWSYM GUISSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Small Screen -NEWSYM GUITBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Triple Buffering -NEWSYM GUIHSVID, db 0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,1 ; Half/Quarter Scanlines -NEWSYM GUI2xVID, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1 ; 2xSaI/Super Eagle Engines -NEWSYM GUIM7VID, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1 ; ?Mode 7 video thing? -NEWSYM GUIWFVID, db 0,0,0,1,0,0,0,1,1,1,0,0,1,1,0,0,1,1,0,0,0,0 ; If Windows Full Screen -NEWSYM GUIDSIZE, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1 -NEWSYM GUIRATIO, db 0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -NEWSYM GUIBIFIL, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -NEWSYM GUITBWVID, db 0,0,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1 ; Triple Buffering (Win) +NEWSYM GUI16VID, db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 ; 16-bit mode +NEWSYM GUINGVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; New Graphics Mode Available +NEWSYM GUISLVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Scanlines +NEWSYM GUIINVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Interpolation +NEWSYM GUII2VID, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1,1,1 ; Interpolation(w) +NEWSYM GUIEAVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Eagle +NEWSYM GUIIEVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; (Interp | Eagle) +NEWSYM GUIFSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Full Screen +NEWSYM GUISSVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Small Screen +NEWSYM GUITBVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ; Triple Buffering +NEWSYM GUIHSVID, db 0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,1,1,1 ; Half/Quarter Scanlines +NEWSYM GUI2xVID, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1,1,1 ; 2xSaI/Super Eagle Engines +NEWSYM GUIM7VID, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1,1,1 ; ?Mode 7 video thing? +NEWSYM GUIWFVID, db 0,0,0,1,0,0,0,1,1,1,0,0,1,1,0,0,1,1,0,0,0,0,1,1 ; If Windows Full Screen +NEWSYM GUIDSIZE, db 0,0,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,1,0,1,0,1,1,1 +NEWSYM GUIRATIO, db 0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +NEWSYM GUIBIFIL, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +NEWSYM GUITBWVID, db 0,0,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,1,1 ; Triple Buffering (Win) SECTION .text ; **************************** diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp index b30454ec..a6f2b91f 100644 --- a/zsnes/src/win/winlink.cpp +++ b/zsnes/src/win/winlink.cpp @@ -1478,14 +1478,14 @@ void initwinvideo(void) SurfaceY=448; break; case 22: - WindowWidth=1600; - WindowHeight=1200; - SurfaceX=512; - SurfaceY=448; + WindowWidth=1280; + WindowHeight=960; + SurfaceX=640; + SurfaceY=480; break; case 23: WindowWidth=1280; - WindowHeight=1024; + WindowHeight=960; SurfaceX=512; SurfaceY=448; break;