From 5802fb56bdc7f9e86c0ac851ca0bd2c5d1481fe8 Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Thu, 23 Oct 2003 04:00:45 +0000 Subject: [PATCH] Add Scale2X to GUI --- zsnes/src/gui/gui.asm | 1 + zsnes/src/gui/guiwindp.inc | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index c1bf68a1..ac1a2396 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -603,6 +603,7 @@ NEWSYM KeyDecStateSlot, dd 0 NEWSYM KeyUsePlayer1234, dd 0 NEWSYM hq3xFilter, db 0 NEWSYM KitchenSync, db 0 +NEWSYM scale2xFilter, db 0 GUIsave equ $-GUIRAdd diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index c8c750f5..653ba4fb 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1770,6 +1770,12 @@ DisplayGUIVideo: je .notext8 GUIOuttextwin2u 5,26,178,GUIVideoText8b,0 .notext8 + xor eax,eax + mov al,[cvidmode] + cmp byte[GUI2xVID+eax],0 + je near .notext11a + GUIOuttextwin2u 5,130,158,GUIVideoTextscale2x,1 +.notext11a xor eax,eax mov al,[cvidmode] cmp byte[GUIHQ3X+eax],0 @@ -1883,10 +1889,16 @@ DisplayGUIVideo: .notext8b xor eax,eax mov al,[cvidmode] - cmp byte[GUIHQ3X+eax],0 + cmp byte[GUI2xVID+eax],0 je near .notext11b - GUIOuttextwin2 5,129,167,GUIVideoTexthq3x + GUIOuttextwin2 5,129,157,GUIVideoTextscale2x .notext11b + xor eax,eax + mov al,[cvidmode] + cmp byte[GUIHQ3X+eax],0 + je near .notext11c + GUIOuttextwin2 5,129,167,GUIVideoTexthq3x +.notext11c GUIOuttextwin2 5,25,187,GUIVideoText8c %ifndef __LINUX__ GUIOuttextwin2 5,129,187,GUIVideoText9 @@ -2070,6 +2082,17 @@ DisplayGUIVideo: .nocheckbox3 GUIDisplayIconWin 5,11,98,[GUITemp] .nocheckbox3b + xor eax,eax + mov al,[cvidmode] + cmp byte[GUI2xVID+eax],0 + je near .nocheckbox2scale2x + mov dword[GUITemp],GUIIconDataCheckBoxUC + cmp byte[scale2xFilter],0 + je .nocheckbox1scale2x + mov dword[GUITemp],GUIIconDataCheckBoxC +.nocheckbox1scale2x + GUIDisplayIconWin 5,115,153,[GUITemp] +.nocheckbox2scale2x xor eax,eax mov al,[cvidmode] cmp byte[GUIHQ3X+eax],0 @@ -2200,6 +2223,7 @@ GUIVideoTextd2 db 'SUPER 2XSAI',0 GUIVideoTextbf db 'BILINEAR FILTER',0 GUIVideoText3 db 'INTERPOLATION',0 ; -y GUIVideoText4 db 'EAGLE ENGINE',0 ; -y +GUIVideoTextscale2x db 'SCALE2X',0 GUIVideoTexthq3x db 'HQ3X',0 GUIVideoText5 db 'FULL SCREEN',0 ; -c GUIVideoText5b db 'WIDE SCREEN',0 ; -c