Last minute changes

zsnes/src/gui/gui.asm

@@ -552,7 +552,7 @@ NEWSYM KeyRewind, dd 0
 NEWSYM ChatNick, times 16 db 0
 NEWSYM KeySlowDown, dd 0
 
-NEWSYM MMXSupport, db 1
+NEWSYM UseCubicSpline, db 1
 
 NEWSYM LargeSoundBuf, db 0
 NEWSYM HighPriority, db 0
@@ -592,6 +592,7 @@ NEWSYM TripleBufferWin, db 0
 
 NEWSYM ExclusiveSound, db 0
 NEWSYM DisableScreenSaver, db 0
+NEWSYM MMXSupport, db 1
 NEWSYM TrapMouseCursor, db 1
 NEWSYM KeyQuickClock, dd 0
 NEWSYM KeyQuickSaveSPC, dd 0
@@ -624,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  ,192  ,108  ,42  ,40  ,42  ,70  ,190 ,60
+GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,184 ,191 ,40  ,189  ,150  ,108  ,42  ,40  ,42  ,70  ,190 ,60
 GUIwinptr   db 0
 
 GUItextcolor db 0,0,0,0,0

zsnes/src/gui/guikeys.inc

@@ -1250,6 +1250,8 @@ GUISoundKeys:
 .nocubicinterp
     cmp dh,'8'
     jne .no8ptinterp
+    cmp byte[MMXSupport],0
+    je .no8ptinterp
     GUIkeystoggleoptn byte[SoundInterpType],3
 .no8ptinterp
     cmp dh,'I'

zsnes/src/gui/guimouse.inc

@@ -1358,6 +1358,28 @@ GUIWinClicked:
 %%noclick
 %endmacro
 
+%macro GUIClickCButton5MMX 4
+    cmp eax,%1+1
+    jl %%noclick
+    cmp edx,%2+3
+    jl %%noclick
+    cmp eax,%1+6
+    jg %%noclick
+    cmp edx,%2+8
+    jg %%noclick
+    cmp byte[MMXSupport],0
+    je %%clear
+    cmp %3,%4
+    jne %%set
+    xor %3,%4
+    jmp %%clear
+%%set
+    mov %3,%4
+%%clear
+    ret
+%%noclick
+%endmacro
+
 %macro GUISlidebarPostImpl 13 ; x1,y1,x2,y2,upjump,downjump,holdpos,scsize,view,cur,listsize
     cmp dword[%11],0
     je near %%nolower
@@ -1888,10 +1910,10 @@ DisplayGUIConfirmClick:
     GUIPButtonHoleLoad 9,163,byte[GUIloadfntype],0
     GUIPButtonHoleLoad 9,171,byte[GUIloadfntype],1
     GUIPButtonHoleLoad 9,179,byte[GUIloadfntype],2
-    GUIClickCButton6 144,177,byte[ForceROMTiming],1
-    GUIClickCButton6 144,187,byte[ForceROMTiming],2
-    GUIClickCButton6 184,177,byte[ForceHiLoROM],1
-    GUIClickCButton6 184,187,byte[ForceHiLoROM],2
+    GUIClickCButton5 144,177,byte[ForceROMTiming],1
+    GUIClickCButton5 144,187,byte[ForceROMTiming],2
+    GUIClickCButton5 184,177,byte[ForceHiLoROM],1
+    GUIClickCButton5 184,187,byte[ForceHiLoROM],2
     ret
 
 DisplayGUIChoseSaveClick:
@@ -2333,12 +2355,12 @@ DisplayGUISoundClick:
 ;.win32sound
     GUIClickCButton 11,131,byte[SoundBufEn]
     GUIClickCButton 11,141,byte[SPCDisable]
-    GUIClickCButton6 11,161,byte[SoundInterpType],1
-    GUIClickCButton6 11,171,byte[SoundInterpType],2
-    GUIClickCButton6 11,181,byte[SoundInterpType],3
-    GUIClickCButton6 111,161,byte[LowPassFilterType],1
-    GUIClickCButton6 111,171,byte[LowPassFilterType],2
-    GUIClickCButton6 111,181,byte[LowPassFilterType],3
+    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
+    GUIClickCButton5 111,181,byte[LowPassFilterType],3
     cmp eax,15
     jl near .nosrate
     cmp edx,61

zsnes/src/gui/guiwindp.inc

@@ -4719,6 +4719,9 @@ GUIGameOptnsTextY db 'ST+',0
 GUIGameOptnsTextZ db 'ST-',0
 
 DisplayGUIOptns:
+%ifdef __WIN32__
+    mov dword[GUIwinsizey+10*4],192
+%endif
     GUIDrawWindowBox 10,GUIGUIDisp
 
     push eax