Moved "Use Primary Buffer" to Sound Options.

zsnes/src/gui/guikeys.inc

@@ -921,10 +921,6 @@ GUIOptionKeys:
     xor byte[RomInfo],1
 .norominfo   
 %ifdef __WIN32__
-    cmp dh,'B'
-    jne .noprimarybuffer
-    xor byte[PrimaryBuffer],1
-.noprimarybuffer
     cmp dh,'I'
     jne .noscreensaver
     xor byte[DisableScreenSaver],1
@@ -1497,6 +1493,10 @@ GUISoundKeys:
     xor byte[RaisePitch],1
 .noraisepitch
 %endif
+    cmp dh,'P'
+    jne .noprimarybuffer
+    xor byte[PrimaryBuffer],1
+.noprimarybuffer
     cmp dh,'R'
     jne .notsrate
     xor eax,eax

zsnes/src/gui/guimouse.inc

@@ -2297,8 +2297,7 @@ DisplayGUIOptionClick:
     GUIClickCButton 11,140,byte[AutoPatch]
     GUIClickCButton 11,150,byte[RomInfo]
 %ifdef __WIN32__
-    GUIClickCButtonW 11,160,byte[PrimaryBuffer]
+    GUIClickCButtonW 11,160,byte[DisableScreenSaver]
-    GUIClickCButtonW 11,170,byte[DisableScreenSaver]
 %endif
     ; Frameskip = 0
     cmp byte[frameskip],0
@@ -2465,6 +2464,9 @@ DisplayGUISoundClick:
     GUIClickCButton5 111,173,byte[LowPassFilterType],2
 %ifndef __MSDOS__
     GUIClickCButton5MMXC 111,183,byte[LowPassFilterType],3
+%endif
+%ifdef __WIN32__
+    GUIClickCButton 11,101,byte[PrimaryBuffer]
 %endif
     cmp eax,15
     jl near .nosrate

zsnes/src/gui/guiwindp.inc

@@ -1637,8 +1637,7 @@ DisplayGUIOption:
     GUIOuttextwin2u 4,26,144,GUIOptionTextE,12
     GUIOuttextwin2u 4,26,154,GUIOptionTextF,15
 %ifdef __WIN32__
-    GUIOuttextwin2u 4,26,164,GUIOptionTextV,12
+    GUIOuttextwin2u 4,26,164,GUIOptionTextW,1
-    GUIOuttextwin2u 4,26,174,GUIOptionTextW,1
 %endif
     add byte[GUItextcolor],15
     GUIOuttextwin2 4,5,13,[GUITemp]
@@ -1662,8 +1661,7 @@ DisplayGUIOption:
     GUIOuttextwin2 4,25,143,GUIOptionTextE
     GUIOuttextwin2 4,25,153,GUIOptionTextF
 %ifdef __WIN32__
-    GUIOuttextwin2 4,25,163,GUIOptionTextV
+    GUIOuttextwin2 4,25,163,GUIOptionTextW
-    GUIOuttextwin2 4,25,173,GUIOptionTextW
 %endif
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[frameskip],0
@@ -1761,17 +1759,11 @@ DisplayGUIOption:
     GUIDisplayIconWin 4,11,150,[GUITemp]
 %ifdef __WIN32__
     mov dword[GUITemp],GUIIconDataCheckBoxUC
-    cmp byte[PrimaryBuffer],0
+    cmp byte[DisableScreenSaver],0
     je .nocheckbox14
     mov dword[GUITemp],GUIIconDataCheckBoxC
 .nocheckbox14
     GUIDisplayIconWin 4,11,160,[GUITemp]
-    mov dword[GUITemp],GUIIconDataCheckBoxUC
-    cmp byte[DisableScreenSaver],0
-    je .nocheckbox15
-    mov dword[GUITemp],GUIIconDataCheckBoxC
-.nocheckbox15
-    GUIDisplayIconWin 4,11,170,[GUITemp]
 %endif
 
 
@@ -1882,8 +1874,7 @@ GUIOptionTextC db 'DON',39,'T SAVE CUR PATH',0
 GUIOptionTextD db 'USE SMALL MESSAGE TEXT',0
 GUIOptionTextE db 'ENABLE AUTO-PATCH',0
 GUIOptionTextF db 'ENABLE ROMINFO.TXT',0
-GUIOptionTextV db 'USE PRIMARY BUFFER',0  ; Try to keep as last option, since its Win Only.
+GUIOptionTextW db 'DISABLE SCREENSAVER',0 ; Try to keep as last option, since its Win Only.
-GUIOptionTextW db 'DISABLE SCREENSAVER',0 ; Same.
 GUIOptionTextX db '-',0
 GUIOptionTextY db '+',0
 GUIOptionTextZ db '-',0
@@ -2570,6 +2561,9 @@ DisplayGUISound:
 %ifdef __MSDOS__
     GUIOuttextwin2u 6,116,26,GUISoundText1b,0
     GUIOuttextwin2u 6,26,44,GUISoundText2b,1
+%endif
+%ifdef __WIN32__
+    GUIOuttextwin2u 6,26,106,GUISoundTextE,4
 %endif
     GUIOuttextwin2u 6,26,116,GUISoundTextH,2
     GUIOuttextwin2u 6,26,126,GUISoundTextI,1
@@ -2591,6 +2585,9 @@ DisplayGUISound:
 %ifdef __MSDOS__
     GUIOuttextwin2 6,115,25,GUISoundText1b
     GUIOuttextwin2 6,25,43,GUISoundText2b
+%endif
+%ifdef __WIN32__
+    GUIOuttextwin2 6,25,105,GUISoundTextE
 %endif
     GUIOuttextwin2 6,25,115,GUISoundTextH
     GUIOuttextwin2 6,25,125,GUISoundTextI
@@ -2715,6 +2712,14 @@ DisplayGUISound:
 .nocheckbox12
     GUIDisplayIconWin 6,111,183,[GUITemp]
 %endif
+%ifdef __WIN32__
+    mov dword[GUITemp],GUIIconDataCheckBoxUC
+    cmp byte[PrimaryBuffer],0
+    jne .nocheckbox13
+    mov dword[GUITemp],GUIIconDataCheckBoxC
+.nocheckbox13
+    GUIDisplayIconWin 6,11,101,[GUITemp]
+%endif
    
     ; Draw borders
     mov dword[GUIWincol],148+10
@@ -2824,6 +2829,7 @@ GUISoundTextB db '16000HZ',0
 GUISoundTextC db '32000HZ',0
 GUISoundTextCb db '48000HZ',0
 GUISoundTextD db '---%',0
+GUISoundTextE db 'USE PRIMARY BUFFER',0
 GUISoundTextH db 'REVERSE STEREO',0
 GUISoundTextI db 'SURROUND SOUND',0
 GUISoundTextJ db 'SOUND BUFFERING',0