diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 91636041..78353826 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -625,7 +625,7 @@ ModemOKStat db 0 ; OK is detected on modem status GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,35 ,5 ,30 ,10 ,10 ,80 ,65 ,20 ,70 ,50 ,3 ,50 GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,20 ,20 ,50 ,60 ,30 ,65 ,50 ,22 ,60 GUIwinsizex dd 0,244 ,126 ,189 ,167 ,170 ,188 ,244 ,8*16,235 ,240 ,7*16,9*16,8*16,9*16,140 ,250 ,160 -GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,184 ,191 ,40 ,189 ,150 ,108 ,42 ,40 ,42 ,70 ,190 ,60 +GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,189 ,150 ,108 ,42 ,40 ,42 ,70 ,190 ,60 GUIwinptr db 0 GUItextcolor db 0,0,0,0,0 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index d6cf0eb2..e6335ab8 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2355,12 +2355,12 @@ DisplayGUISoundClick: ;.win32sound GUIClickCButton 11,131,byte[SoundBufEn] GUIClickCButton 11,141,byte[SPCDisable] - GUIClickCButton5 11,161,byte[SoundInterpType],1 - GUIClickCButton5 11,171,byte[SoundInterpType],2 - GUIClickCButton5MMX 11,181,byte[SoundInterpType],3 - GUIClickCButton5 111,161,byte[LowPassFilterType],1 - GUIClickCButton5 111,171,byte[LowPassFilterType],2 - GUIClickCButton5MMX 111,181,byte[LowPassFilterType],3 + GUIClickCButton5 11,163,byte[SoundInterpType],1 + GUIClickCButton5 11,173,byte[SoundInterpType],2 + GUIClickCButton5MMX 11,183,byte[SoundInterpType],3 + GUIClickCButton5 111,163,byte[LowPassFilterType],1 + GUIClickCButton5 111,173,byte[LowPassFilterType],2 + GUIClickCButton5MMX 111,183,byte[LowPassFilterType],3 cmp eax,15 jl near .nosrate cmp edx,61 diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 4cdee865..7e684e27 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -2174,12 +2174,12 @@ DisplayGUISound: ;.win32s2 GUIOuttextwin2u 6,26,136,GUISoundTextJ,6 GUIOuttextwin2u 6,26,146,GUISoundTextK,0 - GUIOuttextwin2u 6,26,166,GUISoundTextQ,0 - GUIOuttextwin2u 6,26,176,GUISoundTextR,0 - GUIOuttextwin2u 6,26,186,GUISoundTextS,0 - GUIOuttextwin2u 6,126,166,GUISoundTextU,1 - GUIOuttextwin2u 6,126,176,GUISoundTextV,1 - GUIOuttextwin2u 6,126,186,GUISoundTextW,0 + GUIOuttextwin2u 6,26,168,GUISoundTextQ,0 + GUIOuttextwin2u 6,26,178,GUISoundTextR,0 + GUIOuttextwin2u 6,26,188,GUISoundTextS,0 + GUIOuttextwin2u 6,126,168,GUISoundTextU,1 + GUIOuttextwin2u 6,126,178,GUISoundTextV,1 + GUIOuttextwin2u 6,126,188,GUISoundTextW,0 add byte[GUItextcolor],15 GUIOuttextwin2 6,25,25,GUISoundText1 GUIOuttextwin2 6,25,34,GUISoundText3 @@ -2197,19 +2197,19 @@ DisplayGUISound: ;.win32s GUIOuttextwin2 6,25,135,GUISoundTextJ GUIOuttextwin2 6,25,145,GUISoundTextK - GUIOuttextwin2 6,25,165,GUISoundTextQ - GUIOuttextwin2 6,25,175,GUISoundTextR - GUIOuttextwin2 6,25,185,GUISoundTextS - GUIOuttextwin2 6,125,165,GUISoundTextU - GUIOuttextwin2 6,125,175,GUISoundTextV - GUIOuttextwin2 6,125,185,GUISoundTextW + GUIOuttextwin2 6,25,167,GUISoundTextQ + GUIOuttextwin2 6,25,177,GUISoundTextR + GUIOuttextwin2 6,25,187,GUISoundTextS + GUIOuttextwin2 6,125,167,GUISoundTextU + GUIOuttextwin2 6,125,177,GUISoundTextV + GUIOuttextwin2 6,125,187,GUISoundTextW mov al,[GUIWincol] mov byte[GUItextcolor],al GUIOuttextwin2 6,6,16,GUISoundText6 GUIOuttextwin2u 6,6,53,GUISoundText2,9 GUIOuttextwin2 6,6,76,GUISoundText5 - GUIOuttextwin2 6,6,156,GUISoundTextP - GUIOuttextwin2 6,106,156,GUISoundTextT + GUIOuttextwin2 6,6,158,GUISoundTextP + GUIOuttextwin2 6,106,158,GUISoundTextT mov byte[GUItextcolor],163 cmp byte[GUIWincoladd],0 je .zero3 @@ -2218,8 +2218,8 @@ DisplayGUISound: GUIOuttextwin2 6,5,15,GUISoundText6 GUIOuttextwin2 6,5,52,GUISoundText2 GUIOuttextwin2 6,5,75,GUISoundText5 - GUIOuttextwin2 6,5,155,GUISoundTextP - GUIOuttextwin2 6,105,155,GUISoundTextT + GUIOuttextwin2 6,5,157,GUISoundTextP + GUIOuttextwin2 6,105,157,GUISoundTextT mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[cfgsoundon],0 je .nocheckbox @@ -2280,37 +2280,37 @@ DisplayGUISound: jne .nocheckbox7 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox7 - GUIDisplayIconWin 6,11,161,[GUITemp] + GUIDisplayIconWin 6,11,163,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[SoundInterpType],2 jne .nocheckbox8 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox8 - GUIDisplayIconWin 6,11,171,[GUITemp] + GUIDisplayIconWin 6,11,173,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[SoundInterpType],3 jne .nocheckbox9 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox9 - GUIDisplayIconWin 6,11,181,[GUITemp] + GUIDisplayIconWin 6,11,183,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[LowPassFilterType],1 jne .nocheckbox10 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox10 - GUIDisplayIconWin 6,111,161,[GUITemp] + GUIDisplayIconWin 6,111,163,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[LowPassFilterType],2 jne .nocheckbox11 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox11 - GUIDisplayIconWin 6,111,171,[GUITemp] + GUIDisplayIconWin 6,111,173,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[LowPassFilterType],3 jne .nocheckbox12 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox12 - GUIDisplayIconWin 6,111,181,[GUITemp] + GUIDisplayIconWin 6,111,183,[GUITemp] DrawGUIWinBox 6,15,61,69,69,167 mov dword[GUITemp],GUISoundText7 xor eax,eax