From 47452a7888c1edf77994ff2573829766f42abeef Mon Sep 17 00:00:00 2001 From: ipher <> Date: Mon, 4 Apr 2005 14:05:39 +0000 Subject: [PATCH] Added "Pause Emulation" and "Incr Frame" options to the Game Keys window... now time for sleep. --- zsnes/src/gui/gui.asm | 8 ++++++-- zsnes/src/gui/guimouse.inc | 2 ++ zsnes/src/gui/guiwindp.inc | 15 +++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 94fe2957..d6ff677b 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -653,6 +653,10 @@ NEWSYM KeyNextChap, dd 0 NEWSYM KeyPrevChap, dd 0 NEWSYM MovieDisplayFrame, db 0 NEWSYM MovieStartMethod, db 0 +NEWSYM EMUPauseKey, db 0 +NEWSYM INCRFrameKey, db 0 + +;end NEWSYM GUIsave equ $-GUIRAdd @@ -682,9 +686,9 @@ ModemOKStat resb 1 ; OK is detected on modem status 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 ,40 ,3 ,50 ,50 ,5 ,20 -GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,35 ,20 ,20 ,60 ,30 ,65 ,40 ,22 ,60 ,60 ,20 ,60 +GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,40 ,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,180 ,250 ,160 ,160 ,244 ,200 -GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,150 ,150 ,190 ,42 ,40 ,42 ,150 ,190 ,100 ,100 ,190 ,150 +GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,160 ,150 ,190 ,42 ,40 ,42 ,150 ,190 ,100 ,100 ,190 ,150 GUIwinptr db 0 section .bss diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 71ffe09b..014f889c 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2922,6 +2922,8 @@ DisplayGameOptnsClick: DGOptnsProcBox 8+25,148,[KeyQuickChat] DGOptnsProcBox 8+57+45,148,[KeyQuickSnapShot] DGOptnsProcBox 8+108+70,148,[KeyQuickSaveSPC] + DGOptnsProcBox 103,157,[EMUPauseKey] + DGOptnsProcBox 190,157,[INCRFrameKey] ret DisplayGUIOptnsClick: diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index b80d123c..25663999 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -4834,7 +4834,8 @@ DisplayGameOptns: GUIOuttextwin2 9,9+52,149,GUIGameOptnsTextR GUIOuttextwin2 9,9+160,139,GUIGameOptnsTextU GUIOuttextwin2 9,137,149,GUIGameOptnsTextV - + GUIOuttextwin2 9,9,159,GUIGameOptnsTextI + GUIOuttextwin2 9,129,159,GUIGameOptnsTextJ mov byte[GUIGameOptnsColA],163 mov byte[GUIGameOptnsColB],217 cmp byte[GUIWincoladd],0 @@ -4915,6 +4916,8 @@ DisplayGameOptns: GUIOuttextwin2 9,8+52,148,GUIGameOptnsTextR GUIOuttextwin2 9,8+160,138,GUIGameOptnsTextU GUIOuttextwin2 9,136,148,GUIGameOptnsTextV + GUIOuttextwin2 9,8,158,GUIGameOptnsTextI + GUIOuttextwin2 9,128,158,GUIGameOptnsTextJ ;Draw Borders DGOptnsBorderBox 9,26,22 DGOptnsBorderBox 9,71,22 @@ -4990,6 +4993,8 @@ DisplayGameOptns: DGOptnsDrawBox 8+25,147,[KeyQuickChat] DGOptnsDrawBox 8+57+45,147,[KeyQuickSnapShot] DGOptnsDrawBox 8+108+70,147,[KeyQuickSaveSPC] + DGOptnsDrawBox 103,157,[EMUPauseKey] + DGOptnsDrawBox 190,157,[INCRFrameKey] ret SECTION .bss @@ -5015,9 +5020,11 @@ GUIGameOptnsTextE db 'NEW GFX ENG',0 GUIGameOptnsTextF db 'BG WINDOW',0 GUIGameOptnsTextG db 'OFFSET MODE',0 GUIGameOptnsTextH db 'FASTFWD KEY',0 -GUIGameOptnsTextI db 'INSERT CHAPTER',0 -GUIGameOptnsTextJ db 'NEXT CHAPTER',0 -GUIGameOptnsTextK db 'PREV CHAPTER',0 +GUIGameOptnsTextI db 'PAUSE EMULATION',0 +GUIGameOptnsTextJ db 'INCR FRAME',0 +;GUIGameOptnsTextI db 'INSERT CHAPTER',0 +;GUIGameOptnsTextJ db 'NEXT CHAPTER',0 +;GUIGameOptnsTextK db 'PREV CHAPTER',0 ;GUIGameOptnsTextI db 'SAVE',0 ;GUIGameOptnsTextJ db 'LOAD',0 ;GUIGameOptnsTextK db 'PICK',0