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

Trash Add-On menu. Now have devices menu.

Browse Source
This commit is contained in:
n-a-c-h
2006-03-23 22:23:11 +00:00
parent 550fa89f24
commit 94d42c67c7
5 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,7 @@ EXTSYM GUIEnableTransp,FilteredGUI,MouseWheel,TrapMouseCursor,AlwaysOnTop
EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch
EXTSYM KeyDisplayBatt,PauseFocusChange,KeyIncreaseGamma,KeyDecreaseGamma
EXTSYM MovieVideoMode, MovieAudio,MovieVideoAudio,MovieAudioCompress
EXTSYM device1,device2
%ifdef __UNIXSDL__
EXTSYM numlockptr
@@ -178,7 +179,7 @@ NEWSYM WaterOn, db 1
;-------------------------------------------------------
; Load Input Add Code Modem Misc Keys
; Run ----- Browse IPX GUI Opns
; Reset Add-Ons Search Movie Opn
; Reset Devices Search Movie Opn
; ----- Chip Cfg Key Comb.
; Save State ----- Save Cfg
; Load State Options -----
@@ -206,7 +207,7 @@ NEWSYM WaterOn, db 1
; 14 = SaveState Confirmation
; 15 = Movies
; 16 = Key Combo
; 17 = Add-Ons
; 17 = Devices
; 18 = Chip Config
; 19 = Paths
; 20 = Saves
@@ -251,7 +252,7 @@ GUIGameMenuData:
GUIConfigMenuData:
db 1,'INPUT ',0
db 0,'------------',0
db 1,'ADD-ONS ',0
db 1,'DEVICES ',0
db 1,'CHIP CFG ',0
db 0,'------------',0
db 1,'OPTIONS ',0
@@ -2155,7 +2156,7 @@ GUITryMenuItem: ; Defines which menu item calls what window
;The number on the left is the window to open
;the number on the right is where in the drop down box we are
GUICheckMenuItem 3,0 ; Input #1-5
GUICheckMenuItem 17,2 ; Add-Ons
GUICheckMenuItem 17,2 ; Devices
GUICheckMenuItem 18,3 ; Chip Config
GUICheckMenuItem 4,5 ; Options
cmp byte[GUIcrowpos],6 ; Video

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

@@ -872,11 +872,13 @@ GUIAddonKeys:
ja .nocap
sub dh,'z'-'Z'
.nocap
GUIKeyButtonHole snesmouse,0,'N' ;Radio Buttons
GUIKeyButtonHole snesmouse,1,'1'
GUIKeyButtonHole snesmouse,2,'2'
GUIKeyButtonHole snesmouse,3,'S'
GUIKeyButtonHole snesmouse,4,'L'
GUIKeyButtonHole device1,0,'G' ;Radio Buttons
GUIKeyButtonHole device1,1,'M'
GUIKeyButtonHole device2,0,'A'
GUIKeyButtonHole device2,1,'O'
GUIKeyButtonHole device2,2,'S'
GUIKeyButtonHole device2,3,'1'
GUIKeyButtonHole device2,4,'2'
ret
GUIChipKeys:

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

@@ -3260,11 +3260,14 @@ DisplayGUICheatSearchClick:
ret
DisplayGUIAddOnClick:
GUIPButtonHole 9,15,byte[snesmouse],0
GUIPButtonHole 9,25,byte[snesmouse],1
GUIPButtonHole 9,35,byte[snesmouse],2
GUIPButtonHole 9,45,byte[snesmouse],3
GUIPButtonHole 9,55,byte[snesmouse],4
GUIPButtonHole 9,15,byte[device1],0
GUIPButtonHole 9,25,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
ret
DisplayGUIChipClick:

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

@@ -4236,25 +4236,31 @@ DisplayGUIAddOns: ;Select Special Controllers
jmp .endEE
.noEE ;Regular
GUIDisplayTextu 17,21,18,GUIAddOnText1,0
GUIDisplayTextu 17,21,28,GUIAddOnText2,20
GUIDisplayTextu 17,21,38,GUIAddOnText3,20
GUIDisplayTextu 17,21,48,GUIAddOnText4,0
GUIDisplayTextu 17,21,58,GUIAddOnText5,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[snesmouse],0 ;Radio Buttons
GUIDisplayButtonHole 17,9,25,byte[snesmouse],1
GUIDisplayButtonHole 17,9,35,byte[snesmouse],2
GUIDisplayButtonHole 17,9,45,byte[snesmouse],3
GUIDisplayButtonHole 17,9,55,byte[snesmouse],4
GUIDisplayButtonHole 17,9,15,byte[device1],0 ;Radio Buttons
GUIDisplayButtonHole 17,9,25,byte[device1],1
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
ret
SECTION .data
GUIAddOnText1 db 'NONE',0
GUIAddOnText2 db 'SNES MOUSE AT PORT #1',0
GUIAddOnText3 db 'SNES MOUSE AT PORT #2',0
GUIAddOnText4 db 'SUPER SCOPE',0
GUIAddOnText5 db 'LETHAL ENFORCER GUN',0
GUIAddOnText1 db 'GAMEPAD',0
GUIAddOnText2 db 'MOUSE',0
GUIAddOnText3 db 'SUPER SCOPE',0
GUIAddOnText4 db '1 JUSTIFIER',0
GUIAddOnText5 db '2 JUSTIFIERS',0
;EE
GUIAddOnText1Alt db 79,70,70,0
@@ -4797,7 +4803,7 @@ GUIAboutDisp db 'ABOUT',0
GUIMovieDisp db 'MOVIE OPTIONS',0
GUIStatesDisp db 'STATE CONFIRM',0
GUIComboDisp db 'KEY COMBINATION EDITOR',0
GUIAddOnsDisp db 'ADD-ON SELECTOR',0
GUIAddOnsDisp db 'DEVICES SELECTOR',0
GUIChipConfigDisp db 'CONFIGURE CHIPS',0
GUIPathsDisp db 'SETUP PATHS',0
GUISaveDisp db 'SAVE OPTIONS',0

2
zsnes/src/uic.c
View File

@@ -121,6 +121,8 @@ unsigned char Sup16mbit = 0; // Support 16mbit roms
unsigned char dmadeddis = 0; // DMA deduction
unsigned char antienab = 0; // Interpolation Enabled
unsigned char snesmouse = 0; // Mouse status (1 = enabled)
unsigned char device1 = 0; // Device in port 1? 0 = Gamepad
unsigned char device2 = 0; // Device in port 2?
unsigned char OldStyle = 1; // Old style joystick on
unsigned char SecondPort = 0; // Secondary Joystick Port Enabled (209h) (DOS port only)