diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index b81eac5e..638cf238 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -613,6 +613,7 @@ NEWSYM SDRatio, db 0 ; 0 = /2, 28 = /30 NEWSYM KeyEmuSpeedUp, dd 0 NEWSYM KeyEmuSpeedDown, dd 0 NEWSYM AllowUDLR, db 0 +NEWSYM EEgg, db 0 ;end NEWSYM end GUIsave equ $-GUIRAdd diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 3894ad12..6d9d56f4 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -340,6 +340,8 @@ GUIgetcurrentinput: je near GUICheatKeys cmp ebx,10 je near GUIGUIOptnsKeys + cmp ebx,11 + je near GUIAboutKeys cmp ebx,12 je near GUIResetKeys cmp ebx,13 @@ -689,6 +691,19 @@ GUIOptionKeys: %endif 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: cmp dh,'a' ; Setup jb .nocap diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 85ef8c36..9118d563 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2962,9 +2962,12 @@ DisplayGUIOptnsClick: ret DisplayGUIAboutClick: + cmp byte[EEgg],1 + je .eegg %ifndef __MSDOS__ GUIPHoldbutton 90,30,175,40,65 %endif +.eegg ret %macro ComboBoxProc 5 diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 91790123..5bc4419f 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -429,7 +429,7 @@ GUIStringGreater2: GUIDisplayIconWin %1,%2,%3,[GUITemp] %endmacro -%macro GUIDisplayText 4 +%macro GUIDisplayText 4 ; Text&Shadow mov byte[GUItextcolor],202 cmp byte[GUIWincoladd],0 je %%text @@ -440,11 +440,11 @@ GUIOuttextwin2 %1,%2,%3,%4 GUIOuttextwin2 %1,%2-1,%3-1,%4 %endmacro -%macro GUIDisplayTextY 4 - mov al,[GUIWincol] ; Yellow Shadow +%macro GUIDisplayTextY 4 ; Yellow Text&Shadow + mov al,[GUIWincol] mov byte[GUItextcolor],al GUIOuttextwin2 %1,%2,%3,%4 - mov byte[GUItextcolor],163 ; Yellow Text + mov byte[GUItextcolor],163 cmp byte[GUIWincoladd],0 je %%texty mov byte[GUItextcolor],164 @@ -452,7 +452,7 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4 GUIOuttextwin2 %1,%2-1,%3-1,%4 %endmacro -%macro GUIDisplayTextu 5 +%macro GUIDisplayTextu 5 ; Text&Shadow With Underline mov byte[GUItextcolor],202 cmp byte[GUIWincoladd],0 je %%textu @@ -463,7 +463,7 @@ GUIOuttextwin2u %1,%2,%3,%4,%5 GUIOuttextwin2 %1,%2-1,%3-1,%4 %endmacro -%macro GUIDisplayCheckbox 4 +%macro GUIDisplayCheckbox 4 ; Toggled Checkbox mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[%4],0 je %%nocheckbox @@ -472,7 +472,7 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4 GUIDisplayIconWin %1,%2,%3,[GUITemp] %endmacro -%macro GUIDisplayCheckboxn 5 +%macro GUIDisplayCheckboxn 5 ; Set Var. Checkbox mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[%4],%5 jne %%nocheckbox @@ -481,8 +481,8 @@ GUIOuttextwin2 %1,%2-1,%3-1,%4 GUIDisplayIconWin %1,%2,%3,[GUITemp] %endmacro -%macro GUIDisplayBBoxS 6 - mov dword[GUIWincol],148+10 +%macro GUIDisplayBBoxS 6 ; Black Box W/Border + mov dword[GUIWincol],148+10 ; Minus right side cmp byte[cwindrawn],1 jne %%noone 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 %endmacro -%macro GUIDisplayBBox 6 +%macro GUIDisplayBBox 6 ; Black Box W/Border mov dword[GUIWincol],148+10 cmp byte[cwindrawn],1 jne %%noone @@ -3404,6 +3404,8 @@ DisplayGUIAbout: ; Displays the About Box popad GUIDrawWindowBox 11,GUIAboutDisp + cmp byte[EEgg],1 + je .eegg GUIDisplayText 11,6,16,GUIGUIAboutTextA1 ; Text GUIDisplayText 11,6,26,GUIGUIAboutTextA2 GUIDisplayTextY 11,6,36,GUIGUIAboutTextB @@ -3421,7 +3423,7 @@ DisplayGUIAbout: ; Displays the About Box GUIDisplayText 11,6,171,GUIGUIAboutTextD5 GUIDisplayText 11,6,181,GUIGUIAboutTextD6 GUIDisplayText 11,6,191,GUIGUIAboutTextD7 - + mov byte[GUItextcolor],217 ; Buttons cmp byte[GUIWincoladd],0 je .zero3 @@ -3430,6 +3432,12 @@ DisplayGUIAbout: ; Displays the About Box DrawGUIButton 11,90,30,175,40,GUIGUIAboutTextE,65,0,0 ret + .eegg ;Playground + GUIDisplayText 11,42,36,GUIGUIAboutTextF + GUIDisplayText 11,30,96,GUIGUIAboutTextFa + GUIDisplayText 11,39,106,GUIGUIAboutTextFb + ret + SECTION .data GUIGUIAboutTextA1 db 'ZSNES V',ZVERSION,' ',0 ;Need room for date %ifdef __MSDOS__ @@ -3460,6 +3468,9 @@ GUIGUIAboutTextD7 db 'thoroughly before doing so.',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