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

Added 12 hour clock toggle

Browse Source
This commit is contained in:
pagefault
2006-03-28 21:39:13 +00:00
parent e99ff4819a
commit e661b063ac
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zsnes/src/cfg.psr
View File

@@ -352,6 +352,7 @@ NEWSYM MovieVideoMode, db 4
NEWSYM MovieAudio, db 1 NEWSYM MovieAudio, db 1
NEWSYM MovieVideoAudio, db 0 NEWSYM MovieVideoAudio, db 0
NEWSYM MovieAudioCompress, db 0 NEWSYM MovieAudioCompress, db 0
NEWSYM TwelveHourClock, db 0
NEWSYM NTSCFilter, db 0 NEWSYM NTSCFilter, db 0
NEWSYM NTSCBlend, db 0 NEWSYM NTSCBlend, db 0
NEWSYM NTSCHue, db 0 NEWSYM NTSCHue, db 0

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

@@ -141,7 +141,7 @@ EXTSYM GUIEnableTransp,FilteredGUI,MouseWheel,TrapMouseCursor,AlwaysOnTop
EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch
EXTSYM KeyDisplayBatt,PauseFocusChange,KeyIncreaseGamma,KeyDecreaseGamma EXTSYM KeyDisplayBatt,PauseFocusChange,KeyIncreaseGamma,KeyDecreaseGamma
EXTSYM MovieVideoMode, MovieAudio,MovieVideoAudio,MovieAudioCompress EXTSYM MovieVideoMode, MovieAudio,MovieVideoAudio,MovieAudioCompress
EXTSYM device1,device2 EXTSYM device1,device2,TwelveHourClock
%ifdef __UNIXSDL__ %ifdef __UNIXSDL__
EXTSYM numlockptr EXTSYM numlockptr

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

@@ -788,6 +788,7 @@ GUIOptionKeys:
GUIKeyCheckbox FPSAtStart,'F' GUIKeyCheckbox FPSAtStart,'F'
GUIKeyCheckbox Turbo30hz,'E' GUIKeyCheckbox Turbo30hz,'E'
GUIKeyCheckbox TimerEnable,'C' GUIKeyCheckbox TimerEnable,'C'
GUIKeyCheckbox TwelveHourClock,'1'
GUIKeyCheckbox OldGfxMode2,'O' GUIKeyCheckbox OldGfxMode2,'O'
GUIKeyCheckbox DontSavePath,'D' GUIKeyCheckbox DontSavePath,'D'
GUIKeyCheckbox SmallMsgText,'S' GUIKeyCheckbox SmallMsgText,'S'

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

@@ -2392,6 +2392,7 @@ DisplayGUIOptionClick:
GUIClickCButton 11,70,byte[FPSAtStart] GUIClickCButton 11,70,byte[FPSAtStart]
GUIClickCButton 11,80,byte[Turbo30hz] GUIClickCButton 11,80,byte[Turbo30hz]
GUIClickCButton 11,90,byte[TimerEnable] GUIClickCButton 11,90,byte[TimerEnable]
GUIClickCButton 130,90,byte[TwelveHourClock]
GUIClickCButtonO 11,100,byte[OldGfxMode2] GUIClickCButtonO 11,100,byte[OldGfxMode2]
GUIClickCButton 11,110,byte[DontSavePath] GUIClickCButton 11,110,byte[DontSavePath]
GUIClickCButton 11,120,byte[SmallMsgText] GUIClickCButton 11,120,byte[SmallMsgText]

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

@@ -1606,6 +1606,7 @@ DisplayGUIOption: ; Emu Options
GUIDisplayCheckboxu 4,11,70,FPSAtStart,GUIOptionText7,0 GUIDisplayCheckboxu 4,11,70,FPSAtStart,GUIOptionText7,0
GUIDisplayCheckboxu 4,11,80,Turbo30hz,GUIOptionText8,2 GUIDisplayCheckboxu 4,11,80,Turbo30hz,GUIOptionText8,2
GUIDisplayCheckboxu 4,11,90,TimerEnable,GUIOptionText9,12 GUIDisplayCheckboxu 4,11,90,TimerEnable,GUIOptionText9,12
GUIDisplayCheckboxu 4,130,90,TwelveHourClock,GUIOptionText9a,0
GUIDisplayCheckboxu 4,11,100,OldGfxMode2,GUIOptionTextA,0 GUIDisplayCheckboxu 4,11,100,OldGfxMode2,GUIOptionTextA,0
GUIDisplayCheckboxu 4,11,110,DontSavePath,GUIOptionTextB,0 GUIDisplayCheckboxu 4,11,110,DontSavePath,GUIOptionTextB,0
GUIDisplayCheckboxu 4,11,120,SmallMsgText,GUIOptionTextC,1 GUIDisplayCheckboxu 4,11,120,SmallMsgText,GUIOptionTextC,1
@@ -1629,6 +1630,7 @@ GUIOptionText6b db 'HIGH PRIORITY MODE',0
GUIOptionText7 db 'FPS AT PROGRAM START',0 GUIOptionText7 db 'FPS AT PROGRAM START',0
GUIOptionText8 db 'USE 30HZ FOR TURBO',0 GUIOptionText8 db 'USE 30HZ FOR TURBO',0
GUIOptionText9 db 'ENABLE GAME CLOCK',0 GUIOptionText9 db 'ENABLE GAME CLOCK',0
GUIOptionText9a db '12HR',0
GUIOptionTextA db 'OLD GFX MODE 2',0 GUIOptionTextA db 'OLD GFX MODE 2',0
GUIOptionTextB db 'DON',39,'T SAVE CUR PATH',0 GUIOptionTextB db 'DON',39,'T SAVE CUR PATH',0
GUIOptionTextC db 'USE SMALL MESSAGE TEXT',0 GUIOptionTextC db 'USE SMALL MESSAGE TEXT',0

5
zsnes/src/video/procvid.asm
View File

@@ -2667,6 +2667,7 @@ NEWSYM tempoffset, resw 1
NEWSYM Testval, resd 1 NEWSYM Testval, resd 1
SECTION .text SECTION .text
EXTSYM TwelveHourClock
NEWSYM ClockOutput NEWSYM ClockOutput
cmp byte[cbitmode],1 cmp byte[cbitmode],1
@@ -2733,6 +2734,10 @@ NEWSYM ClockOutput
call .output call .output
pop eax pop eax
; eax = hours ; eax = hours
cmp byte[TwelveHourClock],1
jne .no12hour
sub eax,12
.no12hour
xor edx,edx xor edx,edx
mov ebx,10 mov ebx,10
div ebx div ebx