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

Added customizable colors for the windows and title bar.

Browse Source
This commit is contained in:
zsknight
2001-05-15 06:12:55 +00:00
parent ae2b4e7ec5
commit f8333a23ad
3 changed files with 552 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,6 +570,14 @@ NEWSYM pl4Rtk, dd 0 ; Turbo R
NEWSYM pl5Ltk, dd 0 ; Turbo L NEWSYM pl5Ltk, dd 0 ; Turbo L
NEWSYM pl5Rtk, dd 0 ; Turbo R NEWSYM pl5Rtk, dd 0 ; Turbo R
NEWSYM GUITRAdd, db 0
NEWSYM GUITGAdd, db 10
NEWSYM GUITBAdd, db 31
NEWSYM GUIWRAdd, db 8
NEWSYM GUIWGAdd, db 8
NEWSYM GUIWBAdd, db 25
GUIsave equ $-GUIRAdd GUIsave equ $-GUIRAdd
NEWSYM CombinDataGlob, times 3300 db 0 ; 20-name, 42-combo, 2-key#, 1-P#, 1-ff NEWSYM CombinDataGlob, times 3300 db 0 ; 20-name, 42-combo, 2-key#, 1-P#, 1-ff
@@ -644,6 +652,7 @@ GUIPalConv dd 0
PrevResoln dw 0 PrevResoln dw 0
SnowMover dd 0 SnowMover dd 0
keycontrolval dd 0 keycontrolval dd 0
NEWSYM CheatBDoor, db 0
NEWSYM ShowTimer, db 0 NEWSYM ShowTimer, db 0
NEWSYM MousePRClick, db 0 NEWSYM MousePRClick, db 0
NEWSYM MouseDis, db 0 NEWSYM MouseDis, db 0
@@ -693,6 +702,7 @@ NEWSYM GUICTimer, dd 0
NEWSYM GUIOn, db 0 NEWSYM GUIOn, db 0
NEWSYM GUIOn2, db 0 NEWSYM GUIOn2, db 0
;GOSPort db 0 ;GOSPort db 0
NEWSYM CurPalSelect, db 0
NEWSYM StartLL, dd 0 NEWSYM StartLL, dd 0
NEWSYM StartLR, dd 0 NEWSYM StartLR, dd 0
@@ -700,6 +710,16 @@ NEWSYM LatencyVal, times 32 db 0
NEWSYM NetLoadState, db 0 NEWSYM NetLoadState, db 0
NEWSYM TRVal, dw 0
NEWSYM TGVal, dw 0
NEWSYM TBVal, dw 0
NEWSYM TRVali, dw 0
NEWSYM TGVali, dw 0
NEWSYM TBVali, dw 0
NEWSYM TRVal2, dw 0
NEWSYM TGVal2, dw 0
NEWSYM TBVal2, dw 0
;ModemProcess db 0 ; Shows current dial/answer process ;ModemProcess db 0 ; Shows current dial/answer process
;ModemPTimer db 0 ; Timer for modem process ;ModemPTimer db 0 ; Timer for modem process
@@ -1177,6 +1197,8 @@ LoadDetermine:
mov byte[GUICheatMenuData+14],1 mov byte[GUICheatMenuData+14],1
mov byte[GUICheatMenuData+14*2],1 mov byte[GUICheatMenuData+14*2],1
mov byte[GUIMiscMenuData+14*2],1 mov byte[GUIMiscMenuData+14*2],1
cmp byte[CheatBDoor],1
je .nomodem
cmp byte[CNetType],21 cmp byte[CNetType],21
je .modem je .modem
cmp byte[CNetType],22 cmp byte[CNetType],22
@@ -3162,12 +3184,15 @@ GUITryMenuItem:
.noconfig .noconfig
cmp byte[romloadskip],0 cmp byte[romloadskip],0
jne near .nocheat jne near .nocheat
cmp byte[CheatBDoor],1
je .yescheat
cmp byte[CNetType],20 cmp byte[CNetType],20
je near .nocheat je near .nocheat
cmp byte[CNetType],21 cmp byte[CNetType],21
je near .nocheat je near .nocheat
cmp byte[CNetType],22 cmp byte[CNetType],22
je near .nocheat je near .nocheat
.yescheat
cmp byte[GUIcmenupos],4 cmp byte[GUIcmenupos],4
jne near .nocheat jne near .nocheat
GUICheckMenuItem 7, 0 GUICheckMenuItem 7, 0
@@ -3874,14 +3899,48 @@ GUISetPal:
cmp bl,32 cmp bl,32
jne .loope jne .loope
GUIPal 64,0,21,57 ; 0,10,31
GUIPal 65,0,21,54 mov al,[GUITRAdd]
GUIPal 66,0,20,51 mov [TRVal],al
GUIPal 67,0,18,48 mov al,[GUITGAdd]
GUIPal 68,0,16,44 mov [TGVal],al
GUIPal 69,0,14,40 mov al,[GUITBAdd]
GUIPal 70,0,12,36 mov [TBVal],al
GUIPal 71,0,10,31 mov ax,[TRVal]
inc ax
shr ax,3
mov [TRVali],ax
shl ax,3
add [TRVal],ax
mov ax,[TGVal]
inc ax
shr ax,3
mov [TGVali],ax
shl ax,3
add [TGVal],ax
mov ax,[TBVal]
inc ax
shr ax,3
mov [TBVali],ax
shl ax,3
add [TBVal],ax
GUIPal 64,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 65,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 66,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 67,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 68,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 69,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 70,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 71,[TRVal],[TGVal],[TBVal]
GUIPal 72,40,0,20 GUIPal 72,40,0,20
GUIPal 73,34,0,21 GUIPal 73,34,0,21
@@ -3917,23 +3976,80 @@ GUISetPal:
jnz .loopf jnz .loopf
; Blue scale = 148 .. 167 ; Blue scale = 148 .. 167
GUIPal 148,00,00,34 mov al,[GUIWRAdd]
GUIPal 149,04,04,38 add al,al
GUIPal 150,08,08,42 mov [TRVal],al
GUIPal 151,12,12,46 mov al,[GUIWGAdd]
GUIPal 152,16,16,50 add al,al
mov [TGVal],al
mov al,[GUIWBAdd]
add al,al
mov [TBVal],al
mov byte[TRVali],4
mov byte[TGVali],4
mov byte[TBVali],4
GUIPal 153,05,00,24 GUIPal 152,[TRVal],[TGVal],[TBVal]
GUIPal 154,09,04,28 call DecPalVal
GUIPal 155,13,08,32 GUIPal 151,[TRVal],[TGVal],[TBVal]
GUIPal 156,18,12,36 call DecPalVal
GUIPal 157,23,16,40 GUIPal 150,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 149,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 148,[TRVal],[TGVal],[TBVal]
GUIPal 158,10,00,14 mov al,[GUIWRAdd]
GUIPal 159,14,04,18 add al,al
GUIPal 160,18,08,22 mov [TRVal],al
GUIPal 161,22,12,26 mov al,[GUIWGAdd]
GUIPal 162,26,16,30 add al,al
mov [TGVal],al
mov al,[GUIWBAdd]
add al,al
mov [TBVal],al
mov byte[TRVali],4
mov byte[TGVali],4
mov byte[TBVali],4
call DecPalVal
call DecPalVal
GUIPal 157,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 156,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 155,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 154,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 153,[TRVal],[TGVal],[TBVal]
mov al,[GUIWRAdd]
add al,al
mov [TRVal],al
mov al,[GUIWGAdd]
add al,al
mov [TGVal],al
mov al,[GUIWBAdd]
add al,al
mov [TBVal],al
mov byte[TRVali],4
mov byte[TGVali],4
mov byte[TBVali],4
call DecPalVal
call DecPalVal
call DecPalVal
call DecPalVal
GUIPal 162,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 161,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 160,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 159,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 158,[TRVal],[TGVal],[TBVal]
GUIPal 163,40,40,00 GUIPal 163,40,40,00
GUIPal 164,30,30,00 GUIPal 164,30,30,00
@@ -3942,23 +4058,71 @@ GUISetPal:
GUIPal 167,00,00,00 GUIPal 167,00,00,00
; Blue scale shadow ; Blue scale shadow
GUIPal 168,00,00,17 mov al,[GUIWRAdd]
GUIPal 169,02,02,19 mov [TRVal],al
GUIPal 170,04,04,21 mov al,[GUIWGAdd]
GUIPal 171,06,06,23 mov [TGVal],al
GUIPal 172,08,08,25 mov al,[GUIWBAdd]
mov [TBVal],al
mov byte[TRVali],2
mov byte[TGVali],2
mov byte[TBVali],2
GUIPal 173,02,00,12 GUIPal 172,[TRVal],[TGVal],[TBVal]
GUIPal 174,04,02,14 call DecPalVal
GUIPal 175,06,04,16 GUIPal 171,[TRVal],[TGVal],[TBVal]
GUIPal 176,09,06,18 call DecPalVal
GUIPal 177,11,08,20 GUIPal 170,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 169,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 168,[TRVal],[TGVal],[TBVal]
GUIPal 178,05,00,07 mov al,[GUIWRAdd]
GUIPal 179,07,02,09 mov [TRVal],al
GUIPal 180,09,04,11 mov al,[GUIWGAdd]
GUIPal 181,11,06,13 mov [TGVal],al
GUIPal 182,13,08,15 mov al,[GUIWBAdd]
mov [TBVal],al
mov byte[TRVali],2
mov byte[TGVali],2
mov byte[TBVali],2
call DecPalVal
call DecPalVal
GUIPal 177,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 176,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 175,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 174,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 173,[TRVal],[TGVal],[TBVal]
mov al,[GUIWRAdd]
mov [TRVal],al
mov al,[GUIWGAdd]
mov [TGVal],al
mov al,[GUIWBAdd]
mov [TBVal],al
mov byte[TRVali],2
mov byte[TGVali],2
mov byte[TBVali],2
call DecPalVal
call DecPalVal
call DecPalVal
call DecPalVal
GUIPal 182,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 181,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 180,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 179,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal 178,[TRVal],[TGVal],[TBVal]
GUIPal 183,20,20,00 GUIPal 183,20,20,00
GUIPal 184,15,15,00 GUIPal 184,15,15,00
@@ -4031,13 +4195,39 @@ GUISetPal:
NEWSYM GUICPC, times 256 dw 0 NEWSYM GUICPC, times 256 dw 0
%macro GUIPal16b 4 %macro GUIPal16b 4
mov ax,%2 >> 1 mov ax,%2
shr ax,1
shl ax,11 shl ax,11
or ax,%3 << 5 mov bx,%3
or ax,%4 >> 1 shl bx,5
or ax,bx
mov bx,%4
shr bx,1
or ax,bx
mov word[GUICPC+%1*2],ax mov word[GUICPC+%1*2],ax
%endmacro %endmacro
DecPalVal:
mov ax,[TRVali]
sub word[TRVal],ax
mov ax,[TGVali]
sub word[TGVal],ax
mov ax,[TBVali]
sub word[TBVal],ax
test word[TRVal],8000h
jz .notnegr
mov word[TRVal],0
.notnegr
test word[TGVal],8000h
jz .notnegg
mov word[TGVal],0
.notnegg
test word[TBVal],8000h
jz .notnegb
mov word[TBVal],0
.notnegb
ret
GUISetPal16: GUISetPal16:
; set palette ; set palette
; Fixed Color Scale = 0 .. 31 ; Fixed Color Scale = 0 .. 31
@@ -4123,14 +4313,48 @@ GUISetPal16:
cmp bl,32 cmp bl,32
jne .loope jne .loope
GUIPal16b 64,0,21,57 ; 0,10,31
GUIPal16b 65,0,21,54 mov al,[GUITRAdd]
GUIPal16b 66,0,20,51 mov [TRVal],al
GUIPal16b 67,0,18,48 mov al,[GUITGAdd]
GUIPal16b 68,0,16,44 mov [TGVal],al
GUIPal16b 69,0,14,40 mov al,[GUITBAdd]
GUIPal16b 70,0,12,36 mov [TBVal],al
GUIPal16b 71,0,10,31 mov ax,[TRVal]
inc ax
shr ax,3
mov [TRVali],ax
shl ax,3
add [TRVal],ax
mov ax,[TGVal]
inc ax
shr ax,3
mov [TGVali],ax
shl ax,3
add [TGVal],ax
mov ax,[TBVal]
inc ax
shr ax,3
mov [TBVali],ax
shl ax,3
add [TBVal],ax
GUIPal16b 64,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 65,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 66,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 67,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 68,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 69,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 70,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 71,[TRVal],[TGVal],[TBVal]
GUIPal16b 72,40,0,20 GUIPal16b 72,40,0,20
GUIPal16b 73,34,0,21 GUIPal16b 73,34,0,21
@@ -4166,23 +4390,92 @@ GUISetPal16:
jnz .loopf jnz .loopf
; Blue scale = 148 .. 167 ; Blue scale = 148 .. 167
GUIPal16b 148,00,00,34 mov al,[GUIWRAdd]
GUIPal16b 149,04,04,38 add al,al
GUIPal16b 150,08,08,42 mov [TRVal],al
GUIPal16b 151,12,12,46 mov al,[GUIWGAdd]
GUIPal16b 152,16,16,50 add al,al
mov [TGVal],al
mov al,[GUIWBAdd]
add al,al
mov [TBVal],al
mov byte[TRVali],4
mov byte[TGVali],4
mov byte[TBVali],4
GUIPal16b 153,05,00,24 GUIPal16b 152,[TRVal],[TGVal],[TBVal]
GUIPal16b 154,09,04,28 call DecPalVal
GUIPal16b 155,13,08,32 GUIPal16b 151,[TRVal],[TGVal],[TBVal]
GUIPal16b 156,18,12,36 call DecPalVal
GUIPal16b 157,23,16,40 GUIPal16b 150,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 149,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 148,[TRVal],[TGVal],[TBVal]
GUIPal16b 158,10,00,14 mov al,[GUIWRAdd]
GUIPal16b 159,14,04,18 add al,al
GUIPal16b 160,18,08,22 mov [TRVal],al
GUIPal16b 161,22,12,26 mov al,[GUIWGAdd]
GUIPal16b 162,26,16,30 add al,al
mov [TGVal],al
mov al,[GUIWBAdd]
add al,al
mov [TBVal],al
mov byte[TRVali],4
mov byte[TGVali],4
mov byte[TBVali],4
mov al,[TRVal]
shr al,2
sub [TRVal],al
mov al,[TGVal]
shr al,2
sub [TGVal],al
mov al,[TBVal]
shr al,2
sub [TBVal],al
GUIPal16b 157,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 156,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 155,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 154,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 153,[TRVal],[TGVal],[TBVal]
mov al,[GUIWRAdd]
add al,al
mov [TRVal],al
mov al,[GUIWGAdd]
add al,al
mov [TGVal],al
mov al,[GUIWBAdd]
add al,al
mov [TBVal],al
mov byte[TRVali],4
mov byte[TGVali],4
mov byte[TBVali],4
mov al,[TRVal]
shr al,1
sub [TRVal],al
mov al,[TGVal]
shr al,1
sub [TGVal],al
mov al,[TBVal]
shr al,1
sub [TBVal],al
GUIPal16b 162,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 161,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 160,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 159,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 158,[TRVal],[TGVal],[TBVal]
GUIPal16b 163,40,40,00 GUIPal16b 163,40,40,00
GUIPal16b 164,30,30,00 GUIPal16b 164,30,30,00
@@ -4191,23 +4484,71 @@ GUISetPal16:
GUIPal16b 167,00,00,00 GUIPal16b 167,00,00,00
; Blue scale shadow ; Blue scale shadow
GUIPal16b 168,00,00,17 mov al,[GUIWRAdd]
GUIPal16b 169,02,02,19 mov [TRVal],al
GUIPal16b 170,04,04,21 mov al,[GUIWGAdd]
GUIPal16b 171,06,06,23 mov [TGVal],al
GUIPal16b 172,08,08,25 mov al,[GUIWBAdd]
mov [TBVal],al
mov byte[TRVali],2
mov byte[TGVali],2
mov byte[TBVali],2
GUIPal16b 173,02,00,12 GUIPal16b 172,[TRVal],[TGVal],[TBVal]
GUIPal16b 174,04,02,14 call DecPalVal
GUIPal16b 175,06,04,16 GUIPal16b 171,[TRVal],[TGVal],[TBVal]
GUIPal16b 176,09,06,18 call DecPalVal
GUIPal16b 177,11,08,20 GUIPal16b 170,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 169,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 168,[TRVal],[TGVal],[TBVal]
GUIPal16b 178,05,00,07 mov al,[GUIWRAdd]
GUIPal16b 179,07,02,09 mov [TRVal],al
GUIPal16b 180,09,04,11 mov al,[GUIWGAdd]
GUIPal16b 181,11,06,13 mov [TGVal],al
GUIPal16b 182,13,08,15 mov al,[GUIWBAdd]
mov [TBVal],al
mov byte[TRVali],2
mov byte[TGVali],2
mov byte[TBVali],2
call DecPalVal
call DecPalVal
GUIPal16b 177,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 176,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 175,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 174,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 173,[TRVal],[TGVal],[TBVal]
mov al,[GUIWRAdd]
mov [TRVal],al
mov al,[GUIWGAdd]
mov [TGVal],al
mov al,[GUIWBAdd]
mov [TBVal],al
mov byte[TRVali],2
mov byte[TGVali],2
mov byte[TBVali],2
call DecPalVal
call DecPalVal
call DecPalVal
call DecPalVal
GUIPal16b 182,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 181,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 180,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 179,[TRVal],[TGVal],[TBVal]
call DecPalVal
GUIPal16b 178,[TRVal],[TGVal],[TBVal]
GUIPal16b 183,20,20,00 GUIPal16b 183,20,20,00
GUIPal16b 184,15,15,00 GUIPal16b 184,15,15,00

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

@@ -2628,6 +2628,41 @@ DisplayGUIOptnsClick:
GUIClickCButton 12,168,byte[AlwaysOnTop] GUIClickCButton 12,168,byte[AlwaysOnTop]
GUIClickCButton 12,178,byte[SaveMainWindowPos] GUIClickCButton 12,178,byte[SaveMainWindowPos]
%endif %endif
GUIPButtonHole 48,108,byte[CurPalSelect],0
GUIPButtonHole 88,108,byte[CurPalSelect],1
GUIPButtonHole 135,108,byte[CurPalSelect],2
push eax
cmp byte[CurPalSelect],1
je .yespal2b
cmp byte[CurPalSelect],2
je .yespal3b
mov al,[GUIRAdd]
mov [TRVal2],al
mov al,[GUIGAdd]
mov [TGVal2],al
mov al,[GUIBAdd]
mov [TBVal2],al
jmp .nopal1b
.yespal2b
mov al,[GUITRAdd]
mov [TRVal2],al
mov al,[GUITGAdd]
mov [TGVal2],al
mov al,[GUITBAdd]
mov [TBVal2],al
jmp .nopal1b
.yespal3b
mov al,[GUIWRAdd]
mov [TRVal2],al
mov al,[GUIWGAdd]
mov [TGVal2],al
mov al,[GUIWBAdd]
mov [TBVal2],al
.nopal1b
pop eax
cmp eax,25 cmp eax,25
jl near .nomovebar jl near .nomovebar
cmp eax,25+32*4-1 cmp eax,25+32*4-1
@@ -2638,10 +2673,10 @@ DisplayGUIOptnsClick:
jl .nomovebar1 jl .nomovebar1
cmp edx,126 cmp edx,126
jg .nomovebar1 jg .nomovebar1
cmp byte[GUIRAdd],al cmp byte[TRVal2],al
je .nomovebar1b je .nomovebar1b
mov byte[GUIRAdd],al mov byte[TRVal2],al
call GUISetPal mov byte[TRVal2+1],1
.nomovebar1b .nomovebar1b
mov byte[GUIHold],2 mov byte[GUIHold],2
mov eax,[GUIwinposy+10*4] mov eax,[GUIwinposy+10*4]
@@ -2653,10 +2688,10 @@ DisplayGUIOptnsClick:
jl .nomovebar2 jl .nomovebar2
cmp edx,138 cmp edx,138
jg .nomovebar2 jg .nomovebar2
cmp byte[GUIGAdd],al cmp byte[TGVal2],al
je .nomovebar2b je .nomovebar2b
mov byte[GUIGAdd],al mov byte[TGVal2],al
call GUISetPal mov byte[TRVal2+1],1
.nomovebar2b .nomovebar2b
mov byte[GUIHold],2 mov byte[GUIHold],2
mov eax,[GUIwinposy+10*4] mov eax,[GUIwinposy+10*4]
@@ -2668,10 +2703,10 @@ DisplayGUIOptnsClick:
jl .nomovebar3 jl .nomovebar3
cmp edx,150 cmp edx,150
jg .nomovebar3 jg .nomovebar3
cmp byte[GUIBAdd],al cmp byte[TBVal2],al
je .nomovebar3b je .nomovebar3b
mov byte[GUIBAdd],al mov byte[TBVal2],al
call GUISetPal mov byte[TRVal2+1],1
.nomovebar3b .nomovebar3b
mov byte[GUIHold],2 mov byte[GUIHold],2
mov eax,[GUIwinposy+10*4] mov eax,[GUIwinposy+10*4]
@@ -2679,6 +2714,43 @@ DisplayGUIOptnsClick:
mov [GUIHoldYlim],eax mov [GUIHoldYlim],eax
.nomovebar3 .nomovebar3
.nomovebar .nomovebar
push eax
cmp byte[CurPalSelect],1
je .yespal2
cmp byte[CurPalSelect],2
je .yespal3
mov al,[TRVal2]
mov [GUIRAdd],al
mov al,[TGVal2]
mov [GUIGAdd],al
mov al,[TBVal2]
mov [GUIBAdd],al
jmp .nopal1
.yespal2
mov al,[TRVal2]
mov [GUITRAdd],al
mov al,[TGVal2]
mov [GUITGAdd],al
mov al,[TBVal2]
mov [GUITBAdd],al
jmp .nopal1
.yespal3
mov al,[TRVal2]
mov [GUIWRAdd],al
mov al,[TGVal2]
mov [GUIWGAdd],al
mov al,[TBVal2]
mov [GUIWBAdd],al
.nopal1
pop eax
cmp byte[TRVal2+1],1
jne .nopalchange
call GUISetPal
mov byte[TRVal2+1],0
.nopalchange
cmp byte[GUIHold],2 cmp byte[GUIHold],2
jne .nohold jne .nohold
mov eax,[GUIwinposx+10*4] mov eax,[GUIwinposx+10*4]

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

@@ -4589,6 +4589,37 @@ GUIGameOptnsTextT db 'SLOWDWN KEY',0
DisplayGUIOptns: DisplayGUIOptns:
GUIDrawWindowBox 10,GUIGUIDisp GUIDrawWindowBox 10,GUIGUIDisp
push eax
cmp byte[CurPalSelect],1
je .yespal2b
cmp byte[CurPalSelect],2
je .yespal3b
mov al,[GUIRAdd]
mov [TRVal2],al
mov al,[GUIGAdd]
mov [TGVal2],al
mov al,[GUIBAdd]
mov [TBVal2],al
jmp .nopal1b
.yespal2b
mov al,[GUITRAdd]
mov [TRVal2],al
mov al,[GUITGAdd]
mov [TGVal2],al
mov al,[GUITBAdd]
mov [TBVal2],al
jmp .nopal1b
.yespal3b
mov al,[GUIWRAdd]
mov [TRVal2],al
mov al,[GUIWGAdd]
mov [TGVal2],al
mov al,[GUIWBAdd]
mov [TBVal2],al
.nopal1b
pop eax
mov eax,dword[GUIwinposx+10*4] mov eax,dword[GUIwinposx+10*4]
mov ebx,dword[GUIwinposy+10*4] mov ebx,dword[GUIwinposy+10*4]
mov ecx,eax mov ecx,eax
@@ -4614,19 +4645,19 @@ DisplayGUIOptns:
add ebx,11 add ebx,11
DrawGUILine DrawGUILine
xor eax,eax xor eax,eax
mov al,[GUIRAdd] mov al,[TRVal2]
shl eax,2 shl eax,2
mov dword[GUITemp],22 mov dword[GUITemp],22
add [GUITemp],eax add [GUITemp],eax
GUIDisplayIconWin 10,[GUITemp],120,GUIIconDataSlideBar GUIDisplayIconWin 10,[GUITemp],120,GUIIconDataSlideBar
xor eax,eax xor eax,eax
mov al,[GUIGAdd] mov al,[TGVal2]
shl eax,2 shl eax,2
mov dword[GUITemp],22 mov dword[GUITemp],22
add [GUITemp],eax add [GUITemp],eax
GUIDisplayIconWin 10,[GUITemp],132,GUIIconDataSlideBar GUIDisplayIconWin 10,[GUITemp],132,GUIIconDataSlideBar
xor eax,eax xor eax,eax
mov al,[GUIBAdd] mov al,[TBVal2]
shl eax,2 shl eax,2
mov dword[GUITemp],22 mov dword[GUITemp],22
add [GUITemp],eax add [GUITemp],eax
@@ -4722,6 +4753,9 @@ DisplayGUIOptns:
GUIOuttextwin2u 10,26,58,GUIGUIOptnsText7,5 GUIOuttextwin2u 10,26,58,GUIGUIOptnsText7,5
GUIOuttextwin2u 10,26,68,GUIGUIOptnsText8,0 GUIOuttextwin2u 10,26,68,GUIGUIOptnsText8,0
GUIOuttextwin2u 10,26,78,GUIGUIOptnsTextA,0 GUIOuttextwin2u 10,26,78,GUIGUIOptnsTextA,0
GUIOuttextwin2 10,60,111,GUIGUIOptnsTextG
GUIOuttextwin2 10,100,111,GUIGUIOptnsTextH
GUIOuttextwin2 10,147,111,GUIGUIOptnsTextI
GUIOuttextwin2 10,26,88,GUIGUIOptnsTextB GUIOuttextwin2 10,26,88,GUIGUIOptnsTextB
GUIOuttextwin2 10,26,98,GUIGUIOptnsTextC GUIOuttextwin2 10,26,98,GUIGUIOptnsTextC
%ifdef __WIN32__ %ifdef __WIN32__
@@ -4741,6 +4775,9 @@ DisplayGUIOptns:
GUIOuttextwin2 10,25,57,GUIGUIOptnsText7 GUIOuttextwin2 10,25,57,GUIGUIOptnsText7
GUIOuttextwin2 10,25,67,GUIGUIOptnsText8 GUIOuttextwin2 10,25,67,GUIGUIOptnsText8
GUIOuttextwin2 10,25,77,GUIGUIOptnsTextA GUIOuttextwin2 10,25,77,GUIGUIOptnsTextA
GUIOuttextwin2 10,59,110,GUIGUIOptnsTextG
GUIOuttextwin2 10,99,110,GUIGUIOptnsTextH
GUIOuttextwin2 10,146,110,GUIGUIOptnsTextI
GUIOuttextwin2 10,25,87,GUIGUIOptnsTextB GUIOuttextwin2 10,25,87,GUIGUIOptnsTextB
GUIOuttextwin2 10,25,97,GUIGUIOptnsTextC GUIOuttextwin2 10,25,97,GUIGUIOptnsTextC
%ifdef __WIN32__ %ifdef __WIN32__
@@ -4754,10 +4791,14 @@ DisplayGUIOptns:
mov byte[GUIGUIOptnsText6],'B' mov byte[GUIGUIOptnsText6],'B'
GUIOuttextwin2 10,15,146,GUIGUIOptnsText6 GUIOuttextwin2 10,15,146,GUIGUIOptnsText6
GUIDisplayButtonHole 10,48,108,byte[CurPalSelect],0
GUIDisplayButtonHole 10,88,108,byte[CurPalSelect],1
GUIDisplayButtonHole 10,135,108,byte[CurPalSelect],2
mov dword[GUIGUIOptnsText9],0 mov dword[GUIGUIOptnsText9],0
mov esi,GUIGUIOptnsText9+2 mov esi,GUIGUIOptnsText9+2
xor eax,eax xor eax,eax
mov al,[GUIRAdd] mov al,[TRVal2]
call .processnum call .processnum
GUIOuttextwin2 10,160,123,[GUITemp] GUIOuttextwin2 10,160,123,[GUITemp]
mov byte[GUItextcolor],221 mov byte[GUItextcolor],221
@@ -4769,7 +4810,7 @@ DisplayGUIOptns:
mov dword[GUIGUIOptnsText9],0 mov dword[GUIGUIOptnsText9],0
mov esi,GUIGUIOptnsText9+2 mov esi,GUIGUIOptnsText9+2
xor eax,eax xor eax,eax
mov al,[GUIGAdd] mov al,[TGVal2]
call .processnum call .processnum
GUIOuttextwin2 10,160,135,[GUITemp] GUIOuttextwin2 10,160,135,[GUITemp]
mov byte[GUItextcolor],221 mov byte[GUItextcolor],221
@@ -4781,7 +4822,7 @@ DisplayGUIOptns:
mov dword[GUIGUIOptnsText9],0 mov dword[GUIGUIOptnsText9],0
mov esi,GUIGUIOptnsText9+2 mov esi,GUIGUIOptnsText9+2
xor eax,eax xor eax,eax
mov al,[GUIBAdd] mov al,[TBVal2]
call .processnum call .processnum
GUIOuttextwin2 10,160,147,[GUITemp] GUIOuttextwin2 10,160,147,[GUITemp]
mov byte[GUItextcolor],221 mov byte[GUItextcolor],221
@@ -4814,7 +4855,7 @@ DisplayGUIOptns:
;lastcursres db 0 ; 0 = go to load, 1 = go to previous menu, 2 = no menu ;lastcursres db 0 ; 0 = go to load, 1 = go to previous menu, 2 = no menu
;resetposn db 1 ; 0 = no window reset, 1 = window reset ;resetposn db 1 ; 0 = no window reset, 1 = window reset
GUIGUIOptnsText1 db 'BACK COLOR DISPLACEMENT :',0 GUIGUIOptnsText1 db 'COLOR:',0
GUIGUIOptnsText2 db 'MOUSE WRAP',0 GUIGUIOptnsText2 db 'MOUSE WRAP',0
GUIGUIOptnsText3 db 'MOUSE SHADOW',0 GUIGUIOptnsText3 db 'MOUSE SHADOW',0
GUIGUIOptnsText4 db 'KEEP MENU POSITION',0 GUIGUIOptnsText4 db 'KEEP MENU POSITION',0
@@ -4829,6 +4870,9 @@ GUIGUIOptnsTextC dd 'ENABLE WATER EFFECT',0
GUIGUIOptnsTextD dd 'MAIN WINDOW OPTIONS :',0 GUIGUIOptnsTextD dd 'MAIN WINDOW OPTIONS :',0
GUIGUIOptnsTextE dd 'ALWAYS ON TOP',0 GUIGUIOptnsTextE dd 'ALWAYS ON TOP',0
GUIGUIOptnsTextF db 'SAVE MAIN WINDOW POSITION',0 GUIGUIOptnsTextF db 'SAVE MAIN WINDOW POSITION',0
GUIGUIOptnsTextG db 'BACK',0
GUIGUIOptnsTextH db 'TITLE',0
GUIGUIOptnsTextI db 'WIN',0
DisplayGUIAbout: DisplayGUIAbout:
; cmp byte[OSPort],3 ; cmp byte[OSPort],3