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

Commented the new macros

Browse Source
This commit is contained in:
ipher
2005-05-27 08:16:35 +00:00
parent 3166bcdb8f
commit a4f033f074
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -613,6 +613,7 @@ NEWSYM SDRatio, db 0 ; 0 = /2, 28 = /30
NEWSYM KeyEmuSpeedUp, dd 0 NEWSYM KeyEmuSpeedUp, dd 0
NEWSYM KeyEmuSpeedDown, dd 0 NEWSYM KeyEmuSpeedDown, dd 0
NEWSYM AllowUDLR, db 0 NEWSYM AllowUDLR, db 0
NEWSYM EEgg, db 0
;end NEWSYM end ;end NEWSYM end
GUIsave equ $-GUIRAdd GUIsave equ $-GUIRAdd

15
zsnes/src/gui/guikeys.inc
View File

@@ -340,6 +340,8 @@ GUIgetcurrentinput:
je near GUICheatKeys je near GUICheatKeys
cmp ebx,10 cmp ebx,10
je near GUIGUIOptnsKeys je near GUIGUIOptnsKeys
cmp ebx,11
je near GUIAboutKeys
cmp ebx,12 cmp ebx,12
je near GUIResetKeys je near GUIResetKeys
cmp ebx,13 cmp ebx,13
@@ -689,6 +691,19 @@ GUIOptionKeys:
%endif %endif
ret ret
GUIAboutKeys
cmp dh,'a' ; Setup
jb .nocap
cmp dh,'z'
ja .nocap
sub dh,'z'-'Z'
.nocap
cmp dh,'E'
jne .noeegg
xor byte[EEgg],1
.noeegg
ret
GUISaveKeys: GUISaveKeys:
cmp dh,'a' ; Setup cmp dh,'a' ; Setup
jb .nocap jb .nocap

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

@@ -2962,9 +2962,12 @@ DisplayGUIOptnsClick:
ret ret
DisplayGUIAboutClick: DisplayGUIAboutClick:
cmp byte[EEgg],1
je .eegg
%ifndef __MSDOS__ %ifndef __MSDOS__
GUIPHoldbutton 90,30,175,40,65 GUIPHoldbutton 90,30,175,40,65
%endif %endif
.eegg
ret ret
%macro ComboBoxProc 5 %macro ComboBoxProc 5

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

@@ -429,7 +429,7 @@ GUIStringGreater2:
GUIDisplayIconWin %1,%2,%3,[GUITemp] GUIDisplayIconWin %1,%2,%3,[GUITemp]
%endmacro %endmacro
%macro GUIDisplayText 4 %macro GUIDisplayText 4 ; Text&Shadow
mov byte[GUItextcolor],202 mov byte[GUItextcolor],202
cmp byte[GUIWincoladd],0 cmp byte[GUIWincoladd],0
je %%text je %%text
@@ -440,11 +440,11 @@ GUIOuttextwin2 %1,%2,%3,%4
GUIOuttextwin2 %1,%2-1,%3-1,%4 GUIOuttextwin2 %1,%2-1,%3-1,%4
%endmacro %endmacro
%macro GUIDisplayTextY 4 %macro GUIDisplayTextY 4 ; Yellow Text&Shadow
mov al,[GUIWincol] ; Yellow Shadow mov al,[GUIWincol]
mov byte[GUItextcolor],al mov byte[GUItextcolor],al
GUIOuttextwin2 %1,%2,%3,%4 GUIOuttextwin2 %1,%2,%3,%4
mov byte[GUItextcolor],163 ; Yellow Text mov byte[GUItextcolor],163
cmp byte[GUIWincoladd],0 cmp byte[GUIWincoladd],0
je %%texty je %%texty
mov byte[GUItextcolor],164 mov byte[GUItextcolor],164
@@ -452,7 +452,7 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4
GUIOuttextwin2 %1,%2-1,%3-1,%4 GUIOuttextwin2 %1,%2-1,%3-1,%4
%endmacro %endmacro
%macro GUIDisplayTextu 5 %macro GUIDisplayTextu 5 ; Text&Shadow With Underline
mov byte[GUItextcolor],202 mov byte[GUItextcolor],202
cmp byte[GUIWincoladd],0 cmp byte[GUIWincoladd],0
je %%textu je %%textu
@@ -463,7 +463,7 @@ GUIOuttextwin2u %1,%2,%3,%4,%5
GUIOuttextwin2 %1,%2-1,%3-1,%4 GUIOuttextwin2 %1,%2-1,%3-1,%4
%endmacro %endmacro
%macro GUIDisplayCheckbox 4 %macro GUIDisplayCheckbox 4 ; Toggled Checkbox
mov dword[GUITemp],GUIIconDataCheckBoxUC mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[%4],0 cmp byte[%4],0
je %%nocheckbox je %%nocheckbox
@@ -472,7 +472,7 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4
GUIDisplayIconWin %1,%2,%3,[GUITemp] GUIDisplayIconWin %1,%2,%3,[GUITemp]
%endmacro %endmacro
%macro GUIDisplayCheckboxn 5 %macro GUIDisplayCheckboxn 5 ; Set Var. Checkbox
mov dword[GUITemp],GUIIconDataCheckBoxUC mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[%4],%5 cmp byte[%4],%5
jne %%nocheckbox jne %%nocheckbox
@@ -481,8 +481,8 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4
GUIDisplayIconWin %1,%2,%3,[GUITemp] GUIDisplayIconWin %1,%2,%3,[GUITemp]
%endmacro %endmacro
%macro GUIDisplayBBoxS 6 %macro GUIDisplayBBoxS 6 ; Black Box W/Border
mov dword[GUIWincol],148+10 mov dword[GUIWincol],148+10 ; Minus right side
cmp byte[cwindrawn],1 cmp byte[cwindrawn],1
jne %%noone jne %%noone
mov dword[GUIWincol],148+5 mov dword[GUIWincol],148+5
@@ -502,7 +502,7 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4
DrawGUIWinBox %1,%2,%5+1,%4,%5-1,dl DrawGUIWinBox %1,%2,%5+1,%4,%5-1,dl
%endmacro %endmacro
%macro GUIDisplayBBox 6 %macro GUIDisplayBBox 6 ; Black Box W/Border
mov dword[GUIWincol],148+10 mov dword[GUIWincol],148+10
cmp byte[cwindrawn],1 cmp byte[cwindrawn],1
jne %%noone jne %%noone
@@ -3404,6 +3404,8 @@ DisplayGUIAbout: ; Displays the About Box
popad popad
GUIDrawWindowBox 11,GUIAboutDisp GUIDrawWindowBox 11,GUIAboutDisp
cmp byte[EEgg],1
je .eegg
GUIDisplayText 11,6,16,GUIGUIAboutTextA1 ; Text GUIDisplayText 11,6,16,GUIGUIAboutTextA1 ; Text
GUIDisplayText 11,6,26,GUIGUIAboutTextA2 GUIDisplayText 11,6,26,GUIGUIAboutTextA2
GUIDisplayTextY 11,6,36,GUIGUIAboutTextB GUIDisplayTextY 11,6,36,GUIGUIAboutTextB
@@ -3421,7 +3423,7 @@ DisplayGUIAbout: ; Displays the About Box
GUIDisplayText 11,6,171,GUIGUIAboutTextD5 GUIDisplayText 11,6,171,GUIGUIAboutTextD5
GUIDisplayText 11,6,181,GUIGUIAboutTextD6 GUIDisplayText 11,6,181,GUIGUIAboutTextD6
GUIDisplayText 11,6,191,GUIGUIAboutTextD7 GUIDisplayText 11,6,191,GUIGUIAboutTextD7
mov byte[GUItextcolor],217 ; Buttons mov byte[GUItextcolor],217 ; Buttons
cmp byte[GUIWincoladd],0 cmp byte[GUIWincoladd],0
je .zero3 je .zero3
@@ -3430,6 +3432,12 @@ DisplayGUIAbout: ; Displays the About Box
DrawGUIButton 11,90,30,175,40,GUIGUIAboutTextE,65,0,0 DrawGUIButton 11,90,30,175,40,GUIGUIAboutTextE,65,0,0
ret ret
.eegg ;Playground
GUIDisplayText 11,42,36,GUIGUIAboutTextF
GUIDisplayText 11,30,96,GUIGUIAboutTextFa
GUIDisplayText 11,39,106,GUIGUIAboutTextFb
ret
SECTION .data SECTION .data
GUIGUIAboutTextA1 db 'ZSNES V',ZVERSION,' ',0 ;Need room for date GUIGUIAboutTextA1 db 'ZSNES V',ZVERSION,' ',0 ;Need room for date
%ifdef __MSDOS__ %ifdef __MSDOS__
@@ -3460,6 +3468,9 @@ GUIGUIAboutTextD7 db 'thoroughly before doing so.',0
GUIGUIAboutTextE db 'WWW.ZSNES.COM',0 GUIGUIAboutTextE db 'WWW.ZSNES.COM',0
GUIGUIAboutTextF db 'HIDDEN MESSAGE!',0
GUIGUIAboutTextFa db 'PRESS ',39,'E',39,' TO RETURN ',0
GUIGUIAboutTextFb db 'TO THE ABOUT BOX',0
SECTION .text SECTION .text