a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General fixup of the new window and Game Keys window

Browse Source
This commit is contained in:
ipher
2005-05-14 09:14:32 +00:00
parent f00ef5df57
commit f527f47da0
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zsnes/src/gui/gui.asm
View File

@@ -599,10 +599,10 @@ ViewBuffer resb 50*32
SECTION .data ; Window sizes and positions
; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO CHIP PATH SAVE SPED
GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,35 ,5 ,30 ,10 ,10 ,50 ,65 ,20 ,70 ,40 ,3 ,50 ,50 ,5 ,20 ,20
GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,35 ,22 ,60 ,60 ,20 ,30 ,30
GUIwinsizex dd 0,244 ,126 ,189 ,167 ,180 ,188 ,244 ,8*16,235 ,240 ,190 ,9*16,8*16,9*16,180 ,250 ,160 ,160 ,244 ,200 ,200
GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,160 ,190 ,100 ,100 ,190 ,160 ,160
GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,35 ,5 ,30 ,10 ,10 ,50 ,65 ,20 ,70 ,40 ,3 ,50 ,50 ,5 ,20 ,45
GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,35 ,22 ,60 ,60 ,20 ,30 ,50
GUIwinsizex dd 0,244 ,126 ,189 ,167 ,180 ,188 ,244 ,8*16,235 ,240 ,190 ,9*16,8*16,9*16,180 ,250 ,160 ,160 ,244 ,200 ,150
GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,160 ,190 ,100 ,100 ,190 ,160 ,140
GUIwinptr db 0
section .bss

6
zsnes/src/gui/guimouse.inc
View File

@@ -2787,10 +2787,10 @@ DisplayGameOptnsClick:
DGOptnsProcBox 78,130,[KeyNewGfxSwt]
DGOptnsProcBox 78,140,[KeyWinDisble]
DGOptnsProcBox 78,150,[KeyOffsetMSw]
DGOptnsProcBox 78,160,[KeySlowDown]
; DGOptnsProcBox 78,160,[KeySlowDown]
DGOptnsProcBox 78,170,[EMUPauseKey]
; DGOptnsProcBox 178,100,[KeyRewind]
DGOptnsProcBox 178,110,[KeyFastFrwrd]
; DGOptnsProcBox 178,110,[KeyFastFrwrd]
DGOptnsProcBox 178,120,[KeyVolUp]
DGOptnsProcBox 178,130,[KeyVolDown]
DGOptnsProcBox 178,140,[KeyFRateUp]
@@ -3232,7 +3232,7 @@ DisplayGUISpeedClick
cmp eax,15
jl near .nomovebar
cmp eax,15+100
cmp eax,15+60
jg near .nomovebar
cmp edx,89
jl near .nomovebar

27
zsnes/src/gui/guiwindp.inc
View File

@@ -3887,10 +3887,10 @@ DisplayGameOptns:
GUIOuttextwin2 9,9,132,GUIGameOptnsTextH
GUIOuttextwin2 9,9,142,GUIGameOptnsTextI
GUIOuttextwin2 9,9,152,GUIGameOptnsTextJ
GUIOuttextwin2 9,9,162,GUIGameOptnsTextK
; GUIOuttextwin2 9,9,162,GUIGameOptnsTextK
GUIOuttextwin2 9,9,172,GUIGameOptnsTextL
; GUIOuttextwin2 9,109,102,GUIGameOptnsTextEa
GUIOuttextwin2 9,109,112,GUIGameOptnsTextFa
; GUIOuttextwin2 9,109,112,GUIGameOptnsTextFa
GUIOuttextwin2 9,109,122,GUIGameOptnsTextGa
GUIOuttextwin2 9,109,132,GUIGameOptnsTextHa
GUIOuttextwin2 9,109,142,GUIGameOptnsTextIa
@@ -3972,10 +3972,10 @@ DisplayGameOptns:
GUIOuttextwin2 9,8,131,GUIGameOptnsTextH
GUIOuttextwin2 9,8,141,GUIGameOptnsTextI
GUIOuttextwin2 9,8,151,GUIGameOptnsTextJ
GUIOuttextwin2 9,8,161,GUIGameOptnsTextK
; GUIOuttextwin2 9,8,161,GUIGameOptnsTextK
GUIOuttextwin2 9,8,171,GUIGameOptnsTextL
; GUIOuttextwin2 9,108,101,GUIGameOptnsTextEa
GUIOuttextwin2 9,108,111,GUIGameOptnsTextFa
; GUIOuttextwin2 9,108,111,GUIGameOptnsTextFa
GUIOuttextwin2 9,108,121,GUIGameOptnsTextGa
GUIOuttextwin2 9,108,131,GUIGameOptnsTextHa
GUIOuttextwin2 9,108,141,GUIGameOptnsTextIa
@@ -4012,10 +4012,10 @@ DisplayGameOptns:
DGOptnsBorderBox 9,77,129
DGOptnsBorderBox 9,77,139
DGOptnsBorderBox 9,77,149
DGOptnsBorderBox 9,77,159
; DGOptnsBorderBox 9,77,159
DGOptnsBorderBox 9,77,169
; DGOptnsBorderBox 9,177,99
DGOptnsBorderBox 9,177,109
; DGOptnsBorderBox 9,177,109
DGOptnsBorderBox 9,177,119
DGOptnsBorderBox 9,177,129
DGOptnsBorderBox 9,177,139
@@ -4089,7 +4089,7 @@ GUIGameOptnsTextD db 'MISC TOGGLES :',0
GUIGameOptnsTextE db 'USE PL12/34',0
;GUIGameOptnsTextEa db 'FREE SPACE',0
GUIGameOptnsTextF db 'CLRSWITCHES',0
GUIGameOptnsTextFa db 'FASTFWD KEY',0
;GUIGameOptnsTextFa db 'FASTFWD KEY',0
GUIGameOptnsTextG db 'EXTRADEVICE',0
GUIGameOptnsTextGa db '+VOL',0
GUIGameOptnsTextH db 'NEW GFX ENG',0
@@ -4098,7 +4098,7 @@ GUIGameOptnsTextI db 'BG WINDOW',0
GUIGameOptnsTextIa db '+FRAME RATE',0
GUIGameOptnsTextJ db 'OFFSET MODE',0
GUIGameOptnsTextJa db '-FRAME RATE',0
GUIGameOptnsTextK db 'SLOWDWN KEY',0
;GUIGameOptnsTextK db 'SLOWDWN KEY',0
GUIGameOptnsTextKa db 'DISPLAY FPS',0
GUIGameOptnsTextL db 'PAUSE GAME',0
GUIGameOptnsTextLa db 'INCR FRAME',0
@@ -6389,8 +6389,8 @@ DisplayGUISpeed: ;Speed Options
.zero3
mov al,byte[GUIGameOptnsColA]
mov byte[GUItextcolor],al
GUIOuttextwin2 21,7,18,GUISpeedTextA
GUIOuttextwin2 21,20,78,GUISpeedTextB
GUIOuttextwin2 21,8,19,GUISpeedTextA
GUIOuttextwin2 21,21,79,GUISpeedTextB
mov byte[GUIGameOptnsColA],163 ;Yellow Text
mov byte[GUIGameOptnsColB],217
@@ -6409,11 +6409,16 @@ DisplayGUISpeed: ;Speed Options
DDrawBox 21,100,38,[KeySlowDown]
DDrawBox 21,100,48,[KeyResetSpeed]
DGOptnsBorderBox 21,99,27 ;Borders
DGOptnsBorderBox 21,99,37
DGOptnsBorderBox 21,99,47
mov eax,dword[GUIwinposx+21*4] ; Slider
mov ebx,dword[GUIwinposy+21*4]
mov ecx,eax
add eax,15
add ecx,15+100
add ecx,15+60
add ebx,91
xor edx,edx
mov dl,215