From fa6e6004b6e2f837ffc1f65816ea108e8b52b53b Mon Sep 17 00:00:00 2001 From: n-a-c-h <> Date: Sun, 26 Mar 2006 22:14:03 +0000 Subject: [PATCH] Made device selection more verbose. --- zsnes/src/gui/guimouse.inc | 14 +++++++------- zsnes/src/gui/guiwindp.inc | 36 +++++++++++++++++------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 595d64f9..002577fa 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -3262,14 +3262,14 @@ DisplayGUICheatSearchClick: ret DisplayGUIAddOnClick: - GUIPButtonHole 9,15,byte[device1],0 - GUIPButtonHole 9,25,byte[device1],1 + GUIPButtonHole 9,23,byte[device1],0 + GUIPButtonHole 9,33,byte[device1],1 - GUIPButtonHole 70,15,byte[device2],0 - GUIPButtonHole 70,25,byte[device2],1 - GUIPButtonHole 70,35,byte[device2],2 - GUIPButtonHole 70,45,byte[device2],3 - GUIPButtonHole 70,55,byte[device2],4 + GUIPButtonHole 70,23,byte[device2],0 + GUIPButtonHole 70,33,byte[device2],1 + GUIPButtonHole 70,43,byte[device2],2 + GUIPButtonHole 70,53,byte[device2],3 + GUIPButtonHole 70,63,byte[device2],4 ret DisplayGUIChipClick: diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 241fa88f..ae7b8587 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -4235,32 +4235,30 @@ DisplayGUIAddOns: ;Select Special Controllers GUIDisplayText 17,21,58,GUIAddOnText5Alt jmp .endEE .noEE ;Regular - GUIDisplayTextu 17,21,18,GUIAddOnText1,0 - GUIDisplayTextu 17,21,28,GUIAddOnText2,0 - GUIDisplayTextu 17,82,18,GUIAddOnText1,1 - GUIDisplayTextu 17,82,28,GUIAddOnText2,1 - GUIDisplayTextu 17,82,38,GUIAddOnText3,0 - GUIDisplayTextu 17,82,48,GUIAddOnText4,0 - GUIDisplayTextu 17,82,58,GUIAddOnText5,0 .endEE - GUIDisplayButtonHole 17,9,15,byte[device1],0 ;Radio Buttons - GUIDisplayButtonHole 17,9,25,byte[device1],1 + GUIDisplayText 17,20,15,GUIAddOnText1 + GUIDisplayText 17,82,15,GUIAddOnText2 - GUIDisplayButtonHole 17,70,15,byte[device2],0 - GUIDisplayButtonHole 17,70,25,byte[device2],1 - GUIDisplayButtonHole 17,70,35,byte[device2],2 - GUIDisplayButtonHole 17,70,45,byte[device2],3 - GUIDisplayButtonHole 17,70,55,byte[device2],4 + GUIDisplayButtonHoleTu 17,9,23,byte[device1],0,GUIAddOnText3,0 + GUIDisplayButtonHoleTu 17,9,33,byte[device1],1,GUIAddOnText4,0 + + GUIDisplayButtonHoleTu 17,70,23,byte[device2],0,GUIAddOnText3,1 + GUIDisplayButtonHoleTu 17,70,33,byte[device2],1,GUIAddOnText4,1 + GUIDisplayButtonHoleTu 17,70,43,byte[device2],2,GUIAddOnText5,0 + GUIDisplayButtonHoleTu 17,70,53,byte[device2],3,GUIAddOnText6,0 + GUIDisplayButtonHoleTu 17,70,63,byte[device2],4,GUIAddOnText7,0 ret SECTION .data -GUIAddOnText1 db 'GAMEPAD',0 -GUIAddOnText2 db 'MOUSE',0 -GUIAddOnText3 db 'SUPER SCOPE',0 -GUIAddOnText4 db '1 JUSTIFIER',0 -GUIAddOnText5 db '2 JUSTIFIERS',0 +GUIAddOnText1 db 'PORT 1:',0 +GUIAddOnText2 db 'PORT 2:',0 +GUIAddOnText3 db 'GAMEPAD',0 +GUIAddOnText4 db 'MOUSE',0 +GUIAddOnText5 db 'SUPER SCOPE',0 +GUIAddOnText6 db '1 JUSTIFIER',0 +GUIAddOnText7 db '2 JUSTIFIERS',0 ;EE GUIAddOnText1Alt db 79,70,70,0