diff --git a/zsnes/src/dos/dosintrf.asm b/zsnes/src/dos/dosintrf.asm index 83cb95ce..92b00b01 100644 --- a/zsnes/src/dos/dosintrf.asm +++ b/zsnes/src/dos/dosintrf.asm @@ -920,25 +920,25 @@ NEWSYM NumVideoModes, dd 19 ; GUI Video Mode Names - Make sure that all names are of the same length ; and end with a NULL terminator NEWSYM GUIVideoModeNames -db '256X224X8B MODEQ',0 ; 0 -db '256X240X8B MODEQ',0 ; 1 -db '256X256X8B MODEQ',0 ; 2 -db '320X224X8B MODEX',0 ; 3 -db '320X240X8B MODEX',0 ; 4 -db '320X256X8B MODEX',0 ; 5 -db '640X480X16B VESA1',0 ; 6 -db '320X240X8B VESA2',0 ; 7 -db '320X240X16B VESA2',0 ; 8 -db '320X480X8B VESA2',0 ; 9 -db '320X480X16B VESA2',0 ; 10 -db '512X384X8B VESA2',0 ; 11 -db '512X384X16B VESA2',0 ; 12 -db '640X400X8B VESA2',0 ; 13 -db '640X400X16B VESA2',0 ; 14 -db '640X480X8B VESA2',0 ; 15 -db '640X480X16B VESA2',0 ; 16 -db '800X600X8B VESA2',0 ; 17 -db '800X600X16B VESA2',0 ; 18 +db '256x224x8B MODEQ',0 ; 0 +db '256x240x8B MODEQ',0 ; 1 +db '256x256x8B MODEQ',0 ; 2 +db '320x224x8B MODEX',0 ; 3 +db '320x240x8B MODEX',0 ; 4 +db '320x256x8B MODEX',0 ; 5 +db '640x480x16B VESA1',0 ; 6 +db '320x240x8B VESA2',0 ; 7 +db '320x240x16B VESA2',0 ; 8 +db '320x480x8B VESA2',0 ; 9 +db '320x480x16B VESA2',0 ; 10 +db '512x384x8B VESA2',0 ; 11 +db '512x384x16B VESA2',0 ; 12 +db '640x400x8B VESA2',0 ; 13 +db '640x400x16B VESA2',0 ; 14 +db '640x480x8B VESA2',0 ; 15 +db '640x480x16B VESA2',0 ; 16 +db '800x600x8B VESA2',0 ; 17 +db '800x600x16B VESA2',0 ; 18 db ' ',0 ; Video Mode Feature Availability (1 = Available, 0 = Not Available) diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm index c7957328..5a1eceb7 100644 --- a/zsnes/src/linux/sdlintrf.asm +++ b/zsnes/src/linux/sdlintrf.asm @@ -779,9 +779,9 @@ NEWSYM NumVideoModes, dd 6 ; GUI Video Mode Names - Make sure that all names are of the same length ; and end with a NULL terminator NEWSYM GUIVideoModeNames -db '256X224 R W',0 ;0 +db '256x224 R W',0 ;0 db '256x224 R F',0 ;1 -db '512X448 DR W',0 ;2 +db '512x448 DR W',0 ;2 db '512x448 DR F',0 ;3 db '640x480 DR F',0 ;4 db '800x600 DR F',0 ;5 diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm index f44cf5d0..6c8ab82e 100644 --- a/zsnes/src/video/procvid.asm +++ b/zsnes/src/video/procvid.asm @@ -28,8 +28,8 @@ EXTSYM gammalevel,hirestiledat,ignor512,latchx,latchy,maxbr,ForceNewGfxOff EXTSYM newengen,nextframe,objptr,pressed,prevpal,res512switch,res640,resolutn EXTSYM romispal,scaddtype,scanlines,selcA000,snesmouse,t1cc,vcache4b,vesa2_bpos EXTSYM spritetablea,vesa2_clbit,vesa2_gpos,vesa2_rpos,vesa2red10,vesa2selec -EXTSYM vidbuffer,vram,vsyncon,KeyStateSelct,soundon,Open_File,Read_File -EXTSYM Close_File,Create_File,Write_File,Get_File_Date,Triplebufen,makepal +EXTSYM vidbuffer,vram,KeyStateSelct,soundon,Open_File,Read_File +EXTSYM Close_File,Create_File,Write_File,Get_File_Date,makepal EXTSYM changepal,saveselectpal,displayfpspal,superscopepal,DrawScreen,MMXSupport EXTSYM Get_MouseData,Get_MousePositionDisplacement,GUIEnableTransp,GUIFontData EXTSYM StopSound,StartSound,PrevPicture,File_Seek,File_Seek_End,nggposng @@ -43,7 +43,7 @@ EXTSYM MovieProcessing,mzt_chdir,UpChdir,MovieFrameStr,GetMovieFrameStr EXTSYM MovieDisplayFrame %ifdef __MSDOS__ -EXTSYM SB_blank +EXTSYM SB_blank,vsyncon,Triplebufen %endif SECTION .bss @@ -3279,16 +3279,16 @@ SECTION .bss SECTION .text NEWSYM vidpaste +%ifdef __MSDOS__ cmp byte[vsyncon],0 je .novsync cmp byte[Triplebufen],0 jne .novsync cmp byte[curblank],0h jne .novsync -%ifdef __MSDOS__ call waitvsync -%endif .novsync +%endif cmp byte[cbitmode],1 je .nopal cmp byte[curblank],0