diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 2ca8c90b..a2ca8801 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -348,6 +348,8 @@ GUIgetcurrentinput: je near GUIStateKeys cmp ebx,16 je near GUIComboKeys + cmp ebx,17 + je near GUIAddonKeys cmp ebx,18 je near GUIChipKeys cmp ebx,19 @@ -755,6 +757,38 @@ GUISaveKeys: .nopauserewind ret +GUIAddonKeys: + cmp dh,'a' ;Setup + jb .nocap + cmp dh,'z' + ja .nocap + sub dh,'z'-'Z' +.nocap + + cmp dh,'N' + 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 +.nolethalgun GUIChipKeys: cmp dh,'a' ;Setup diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 07c833e4..29397624 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -5540,11 +5540,11 @@ DisplayGUIAddOns: ;Select Special Controllers GUIOuttextwin2 17,21,58,GUIAddOnText5Alt jmp .endEE .noEE ;Regular - GUIOuttextwin2 17,21,18,GUIAddOnText1 - GUIOuttextwin2 17,21,28,GUIAddOnText2 - GUIOuttextwin2 17,21,38,GUIAddOnText3 - GUIOuttextwin2 17,21,48,GUIAddOnText4 - GUIOuttextwin2 17,21,58,GUIAddOnText5 + GUIOuttextwin2u 17,21,18,GUIAddOnText1,0 + GUIOuttextwin2u 17,21,28,GUIAddOnText2,20 + GUIOuttextwin2u 17,21,38,GUIAddOnText3,20 + GUIOuttextwin2u 17,21,48,GUIAddOnText4,0 + GUIOuttextwin2u 17,21,58,GUIAddOnText5,0 .endEE add byte[GUItextcolor],15 ;Text