diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 99dff448..bad2353a 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -602,7 +602,7 @@ NEWSYM KeyIncStateSlot, dd 0 NEWSYM KeyDecStateSlot, dd 0 NEWSYM KeyUsePlayer1234, dd 0 NEWSYM hq3xFilter, db 0 -NEWSYM KitchenSync, db 0 +NEWSYM RESERVED, db 0 NEWSYM scale2xFilter, db 0 GUIsave equ $-GUIRAdd diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 344d3787..df40d37d 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -1238,14 +1238,14 @@ GUIVideoKeys: ; mov byte[Triplebufen],0 %endif .novsync - cmp dh,'K' - jne .nokitchensync - xor ebx,ebx - mov bl,[cvidmode] - cmp byte[GUITBWVID+ebx],0 - je .nokitchensync - xor byte[KitchenSync],1 -.nokitchensync +; cmp dh,'K' +; jne .nokitchensync +; xor ebx,ebx +; mov bl,[cvidmode] +; cmp byte[GUITBWVID+ebx],0 +; je .nokitchensync +; xor byte[KitchenSync],1 +;.nokitchensync %endif ret diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 03fed4bb..1ee2628d 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2325,12 +2325,12 @@ DisplayGUIVideoClick: je .nocheckboxttb GUIClickCButtonT 11,163,byte[Triplebufen],byte[vsyncon] .nocheckboxttb - xor ebx,ebx - mov bl,[cvidmode] - cmp byte[GUITBWVID+ebx],0 - je .nocheckboxks - GUIClickCButton 83,173,byte[KitchenSync] -.nocheckboxks +; xor ebx,ebx +; mov bl,[cvidmode] +; cmp byte[GUITBWVID+ebx],0 +; je .nocheckboxks +; GUIClickCButton 83,173,byte[KitchenSync] +;.nocheckboxks GUIClickCButton 11,183,byte[GrayscaleMode] %ifdef __WIN32__ GUIClickCButtonf 115,183,byte[vsyncon],initDirectDraw diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 286ff939..213ec560 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1758,10 +1758,10 @@ DisplayGUIVideo: je .notext7 GUIOuttextwin2u 5,26,168,GUIVideoText7,0 .notext7 - cmp byte[GUITBWVID+eax],0 - je .notext77 - GUIOuttextwin2u 5,96,178,GUIVideoText10,0 -.notext77 +; cmp byte[GUITBWVID+eax],0 +; je .notext77 +; GUIOuttextwin2u 5,96,178,GUIVideoText10,0 +;.notext77 xor eax,eax mov al,[cvidmode] cmp byte[GUIM7VID+eax],0 @@ -1875,10 +1875,10 @@ DisplayGUIVideo: je .notext7b GUIOuttextwin2 5,25,167,GUIVideoText7 .notext7b - cmp byte[GUITBWVID+eax],0 - je .notext7c - GUIOuttextwin2 5,95,177,GUIVideoText10 -.notext7c +; cmp byte[GUITBWVID+eax],0 +; je .notext7c +; GUIOuttextwin2 5,95,177,GUIVideoText10 +;.notext7c xor eax,eax mov al,[cvidmode] cmp byte[GUIM7VID+eax],0 @@ -2038,17 +2038,17 @@ DisplayGUIVideo: .nocheckboxm74 GUIDisplayIconWin 5,115,183,[GUITemp] %endif - xor eax,eax - mov al,[cvidmode] - cmp byte[GUITBWVID+eax],0 - je .nocheckboxks2 - mov dword[GUITemp],GUIIconDataCheckBoxUC - cmp byte[KitchenSync],0 - je .nocheckboxks - mov dword[GUITemp],GUIIconDataCheckBoxC -.nocheckboxks - GUIDisplayIconWin 5,83,173,[GUITemp] -.nocheckboxks2 +; xor eax,eax +; mov al,[cvidmode] +; cmp byte[GUITBWVID+eax],0 +; je .nocheckboxks2 +; mov dword[GUITemp],GUIIconDataCheckBoxUC +; cmp byte[KitchenSync],0 +; je .nocheckboxks +; mov dword[GUITemp],GUIIconDataCheckBoxC +;.nocheckboxks +; GUIDisplayIconWin 5,83,173,[GUITemp] +;.nocheckboxks2 xor eax,eax mov al,[cvidmode] cmp byte[GUIIEVID+eax],0 @@ -2233,7 +2233,7 @@ GUIVideoText8b db 'HI-RES M7',0 ; -c GUIVideoText8c db 'GRAYSCALE MODE',0 ; -c GUIVideoText8 db 'SET',0 ; set button GUIVideoText9 db 'VSYNC',0 ; -c -GUIVideoText10 db 'KITCHENSYNC',0 ; -c +;GUIVideoText10 db 'KITCHENSYNC',0 ; -c GUIVideoTextH db 'MODE : ',0 GUIVideoTextw0 db 'LEGEND:',0 GUIVideoTextw1 db ' S = SCALED TO FIT SCREEN',0 diff --git a/zsnes/src/win/zloaderw.c b/zsnes/src/win/zloaderw.c index 94570224..577416f3 100644 --- a/zsnes/src/win/zloaderw.c +++ b/zsnes/src/win/zloaderw.c @@ -32,6 +32,7 @@ extern void displayparams(void); extern void makeextension(void); int pccmdline(void); +extern int KitchenSync = 0; extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable, MMXSupport, Force8b, ForcePal, GUIClick, MouseDis, @@ -671,6 +672,11 @@ int pccmdline(void) MouseDis=1; break; } + case 'K': + { + KitchenSync=1; + break; + } case '?': { return 9;