From fa0e4a21fc4f250ed03a7f50add929ebe43a086f Mon Sep 17 00:00:00 2001 From: ipher <> Date: Thu, 12 May 2005 04:38:20 +0000 Subject: [PATCH] more formatting/commenting, done for the night. --- zsnes/src/gui/guikeys.inc | 26 +++----------------------- zsnes/src/gui/guimouse.inc | 13 ++++++------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index a2ca8801..a60abadb 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -718,39 +718,31 @@ GUISaveKeys: ja .nocap sub dh,'z'-'Z' .nocap - -;Checkboxes - cmp dh,'I' + cmp dh,'I' ; Checkboxes jne .noautoincsave xor byte[AutoIncSaveSlot],1 mov byte[firstsaveinc],1 .noautoincsave - cmp dh,'C' jne .nosramcheck xor byte[SRAMSave5Sec],1 .nosramcheck - cmp dh,'S' jne .nostartsave xor byte[LatestSave],1 .nostartsave - cmp dh,'A' jne .noautostate xor byte[AutoState],1 .noautostate - cmp dh,'L' jne .nosramstate xor byte[SRAMState],1 .nosramstate - cmp dh,'P' jne .nopauseload xor byte[PauseLoad],1 .nopauseload - cmp dh,'R' jne .nopauserewind xor byte[PauseRewind],1 @@ -764,27 +756,22 @@ GUIAddonKeys: ja .nocap sub dh,'z'-'Z' .nocap - - cmp dh,'N' + cmp dh,'N' ;Radio Buttons jne .nonone mov byte[snesmouse],0 .nonone - cmp dh,'1' jne .nomouse1 mov byte[snesmouse],1 .nomouse1 - cmp dh,'2' jne .nomouse2 mov byte[snesmouse],2 .nomouse2 - cmp dh,'S' jne .nosuperscope mov byte[snesmouse],3 .nosuperscope - cmp dh,'L' jne .nolethalgun mov byte[snesmouse],4 @@ -797,33 +784,26 @@ GUIChipKeys: ja .nocap sub dh,'z'-'Z' .nocap - -;Checkboxes - cmp dh,'1' + cmp dh,'1' ;Checkboxes jne .nonssdip1 xor byte[nssdip1],1 .nonssdip1 - cmp dh,'2' jne .nonssdip2 xor byte[nssdip2],1 .nonssdip2 - cmp dh,'3' jne .nonssdip3 xor byte[nssdip3],1 .nonssdip3 - cmp dh,'4' jne .nonssdip4 xor byte[nssdip4],1 .nonssdip4 - cmp dh,'5' jne .nonssdip5 xor byte[nssdip5],1 .nonssdip5 - cmp dh,'6' jne .nonssdip6 xor byte[nssdip6],1 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 83fa9cd1..922e0f3e 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2565,10 +2565,11 @@ SECTION .text DisplayGUICheatClick2: GUISlidebarPostImpl 231,28,238,100,.scrollup,.scrolldown,7,12,GUIcurrentcheatviewloc,GUIcurrentcheatcursloc,NumCheats,GUIBlankVar,1 GUIPostWinBoxMove 5,22,229,22+12*7,GUIcurrentcheatviewloc,GUIcurrentcheatcursloc,NumCheats,.scrollup,.scrolldown,DisplayGUICheatClick.skipscrol,12 + DisplayGUICheatClick: - GUIBoxVar 5,20,181,110,GUIcurrentcheatwin,0 - GUIBoxVar 82,129,173,136,GUIcurrentcheatwin,1 - GUIBoxVar 82,140,196,147,GUIcurrentcheatwin,2 + GUIBoxVar 5,20,181,110,GUIcurrentcheatwin,0 ; Main Box + GUIBoxVar 82,129,173,136,GUIcurrentcheatwin,1 ; Enter Code Box + GUIBoxVar 82,140,196,147,GUIcurrentcheatwin,2 ; Description Box ; SlideBar Implementation GUISlidebarImpl 231,28,238,100,GUICStA,12,GUIcurrentcheatviewloc,GUIcurrentcheatcursloc,NumCheats,7 .skipscrol @@ -2576,14 +2577,13 @@ DisplayGUICheatClick: jne near .nowin GUIWinControl 5,23,229,21+12*7,GUIBlankVar,GUIcurrentcheatviewloc,NumCheats,22,7,GUIcurrentcheatcursloc,3,7,30 .nowin - GUIPHoldbutton 5,113,47,124,5 + GUIPHoldbutton 5,113,47,124,5 ; Buttons GUIPHoldbutton 52,113,94,124,6 GUIPHoldbutton 99,113,141,124,7 GUIPHoldbutton 146,113,188,124,8 GUIPHoldbutton 212,134,236,145,9 GUIPHoldbutton 193,113,235,124,33 - - GUIClickCButton5 11,186,byte[AutoLoadCht],1 + GUIClickCButton5 11,186,byte[AutoLoadCht],1 ; Checkbox ret DisplayNetOptnsClick: @@ -3161,7 +3161,6 @@ DisplayGUIAddOnClick: GUIPButtonHole 9,35,byte[snesmouse],2 GUIPButtonHole 9,45,byte[snesmouse],3 GUIPButtonHole 9,55,byte[snesmouse],4 - ret DisplayGUIChipClick