From 3645c2db6dd47430389b18867bfca8d1b61858ad Mon Sep 17 00:00:00 2001 From: ipher <> Date: Wed, 9 Feb 2005 23:35:50 +0000 Subject: [PATCH] Added "# of rewind states" dummy option to Save Options. --- zsnes/src/gui/gui.asm | 6 ++-- zsnes/src/gui/guimouse.inc | 12 ++++--- zsnes/src/gui/guiwindp.inc | 64 +++++++++++++++++++++++++++++--------- 3 files changed, 59 insertions(+), 23 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 22bf79e2..a531e56b 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -669,11 +669,11 @@ ModemProcess resb 1 ; Shows current dial/answer process ModemPTimer resd 1 ; Timer for modem process ModemOKStat resb 1 ; OK is detected on modem status -SECTION .data +SECTION .data ; Window sizes and positions ; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO CHIP PATH SAVE -GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,35 ,5 ,30 ,10 ,10 ,50 ,65 ,20 ,70 ,50 ,3 ,50 ,50 ,5 ,50 +GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,35 ,5 ,30 ,10 ,10 ,50 ,65 ,20 ,70 ,50 ,3 ,50 ,50 ,5 ,40 GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,20 ,20 ,20 ,60 ,30 ,65 ,50 ,22 ,60 ,60 ,20 ,60 -GUIwinsizex dd 0,244 ,126 ,189 ,167 ,180 ,188 ,244 ,8*16,235 ,240 ,190 ,9*16,8*16,9*16,140 ,250 ,160 ,160 ,244 ,160 +GUIwinsizex dd 0,244 ,126 ,189 ,167 ,180 ,188 ,244 ,8*16,235 ,240 ,190 ,9*16,8*16,9*16,140 ,250 ,160 ,160 ,244 ,170 GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,189 ,150 ,190 ,42 ,40 ,42 ,70 ,190 ,100 ,100 ,190 ,100 GUIwinptr db 0 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 24ffd1e2..67c23609 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -3265,11 +3265,13 @@ DisplayGUIPathsClick ret DisplayGUISaveClick: - GUIClickCButtonAS 11,20,byte[AutoIncSaveSlot] - GUIClickCButton 11,30,byte[SRAMSave5Sec] - GUIClickCButton 11,40,byte[LatestSave] - GUIClickCButton 11,50,byte[AutoState] - GUIClickCButton 11,60,byte[SRAMState] + GUIClickCButtonAS 11,40,byte[AutoIncSaveSlot] + GUIClickCButton 11,50,byte[SRAMSave5Sec] + GUIClickCButton 11,60,byte[LatestSave] + GUIClickCButton 11,70,byte[AutoState] + GUIClickCButton 11,80,byte[SRAMState] + GUIPHoldbutton2 138,22,146,30,70,byte[RewindStates],1,25 + GUIPHoldbutton2 149,22,157,30,71,byte[RewindStates],-1,0 ret DrawMouse: diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index fabfb2b0..244ef472 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -7016,49 +7016,79 @@ DisplayGUISave: mov byte[GUItextcolor],211 .zero sub byte[GUItextcolor],15 - GUIOuttextwin2u 20,26,24,GUISaveText1,5 - GUIOuttextwin2u 20,26,34,GUISaveText2,5 - GUIOuttextwin2u 20,26,44,GUISaveText3,0 - GUIOuttextwin2u 20,26,54,GUISaveText4,0 - GUIOuttextwin2u 20,26,64,GUISaveText5,0 + GUIOuttextwin2 20,8,24,GUISaveText6 + GUIOuttextwin2u 20,26,44,GUISaveText1,5 + GUIOuttextwin2u 20,26,54,GUISaveText2,5 + GUIOuttextwin2u 20,26,64,GUISaveText3,0 + GUIOuttextwin2u 20,26,74,GUISaveText4,0 + GUIOuttextwin2u 20,26,84,GUISaveText5,0 add byte[GUItextcolor],15 - GUIOuttextwin2 20,25,23,GUISaveText1 - GUIOuttextwin2 20,25,33,GUISaveText2 - GUIOuttextwin2 20,25,43,GUISaveText3 - GUIOuttextwin2 20,25,53,GUISaveText4 - GUIOuttextwin2 20,25,63,GUISaveText5 + GUIOuttextwin2 20,7,23,GUISaveText6 + GUIOuttextwin2 20,25,43,GUISaveText1 + GUIOuttextwin2 20,25,53,GUISaveText2 + GUIOuttextwin2 20,25,63,GUISaveText3 + GUIOuttextwin2 20,25,73,GUISaveText4 + GUIOuttextwin2 20,25,83,GUISaveText5 mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[AutoIncSaveSlot],0 je .nocheckbox mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox - GUIDisplayIconWin 20,11,20,[GUITemp] + GUIDisplayIconWin 20,11,40,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[SRAMSave5Sec],0 je .nocheckbox1 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox1 - GUIDisplayIconWin 20,11,30,[GUITemp] + GUIDisplayIconWin 20,11,50,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[LatestSave],0 je .nocheckbox2 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox2 - GUIDisplayIconWin 20,11,40,[GUITemp] + GUIDisplayIconWin 20,11,60,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[AutoState],0 je .nocheckbox3 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox3 - GUIDisplayIconWin 20,11,50,[GUITemp] + GUIDisplayIconWin 20,11,70,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[SRAMState],0 je .nocheckbox4 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox4 - GUIDisplayIconWin 20,11,60,[GUITemp] + GUIDisplayIconWin 20,11,80,[GUITemp] + DrawGUIWinBox 20,120,22,135,29,167 + xor ax,ax + mov ah,[RewindStates] + mov al,48 + add ah,48 +.asciiloop + cmp ah,58 + jb .hex2asciidone + add al,1 + sub ah,10 + jmp .asciiloop +.hex2asciidone + mov [GUISaveTextX],ax + mov byte[GUItextcolor],223 + GUIOuttextwin2 20,124,24,GUISaveTextX + mov byte[GUItextcolor],221 + cmp byte[GUIWincoladd],0 + je .zero4 + mov byte[GUItextcolor],222 +.zero4 + GUIOuttextwin2 20,123,23,GUISaveTextX + mov byte[GUItextcolor],217 + cmp byte[GUIWincoladd],0 + je .zero6 + mov byte[GUItextcolor],211 +.zero6 + DrawGUIButton 20,143,22,151,30,GUISaveTextY,70,-2,-1 + DrawGUIButton 20,154,22,162,30,GUISaveTextZ,71,-2,-1 ret SECTION .data @@ -7067,6 +7097,10 @@ GUISaveText2 db 'SRAM CHECK+SAVE',0 GUISaveText3 db 'START AT LATEST SAVE',0 GUISaveText4 db 'AUTO STATE SAVE/LOAD',0 GUISaveText5 db 'LOAD SAVESTATE W/SRAM',0 +GUISaveText6 db '# OF REWIND STATES',0 +GUISaveTextX db ' ',0 +GUISaveTextY db '+',0 +GUISaveTextZ db '-',0 ;General data GUILoadDisp db 'LOAD GAME',0