From e4506688cb3420955f62d74e7b40fc00ccb3376a Mon Sep 17 00:00:00 2001 From: ipher <> Date: Wed, 13 Apr 2005 22:38:29 +0000 Subject: [PATCH] Add Append and Dump Raw dummy options to the Movie Options window --- zsnes/src/gui/gui.asm | 4 +-- zsnes/src/gui/guimouse.inc | 22 +++++++------ zsnes/src/gui/guiwindp.inc | 64 ++++++++++++++++++-------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 21934f6c..01fb9cf1 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -597,9 +597,9 @@ ViewBuffer resb 50*32 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 ,30 ,20 ,20 ,60 ,30 ,65 ,40 ,22 ,60 ,60 ,20 ,30 +GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,35 ,22 ,60 ,60 ,20 ,30 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 ,170 ,150 ,190 ,42 ,40 ,42 ,150 ,190 ,100 ,100 ,190 ,160 +GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,160 ,190 ,100 ,100 ,190 ,160 GUIwinptr db 0 section .bss diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index dfebf27b..654a1346 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2041,9 +2041,11 @@ DisplayGUIMovieClick: GUIPHoldbutton 7,17,49,28,16 GUIPHoldbutton 7,33,49,44,17 GUIPHoldbutton 7,49,49,60,18 - GUIPHoldbutton 7,65,109,76,29 - GUIPHoldbutton 7,81,109,92,30 - GUIPHoldbutton 7,97,109,108,31 + GUIPHoldbutton 7,81,109,92,29 + GUIPHoldbutton 7,97,109,108,30 + GUIPHoldbutton 7,113,109,124,31 + GUIPHoldbutton 7,65,49,76,32 + GUIPHoldbutton 61,65,118,76,33 GUIPButtonHole 60,25,byte[CMovieExt],'v' GUIPButtonHole 80,25,byte[CMovieExt],'1' GUIPButtonHole 100,25,byte[CMovieExt],'2' @@ -2055,14 +2057,14 @@ DisplayGUIMovieClick: GUIPButtonHole 120,40,byte[CMovieExt],'8' GUIPButtonHole 140,40,byte[CMovieExt],'9' - DGOptnsProcBox 116,68,[KeyInsrtChap] - DGOptnsProcBox 116,84,[KeyPrevChap] - DGOptnsProcBox 116,100,[KeyNextChap] + DGOptnsProcBox 116,84,[KeyInsrtChap] + DGOptnsProcBox 116,100,[KeyPrevChap] + DGOptnsProcBox 116,116,[KeyNextChap] GUIClickCButton 60,50,byte[MovieDisplayFrame] - GUIPButtonHole 8,127,byte[MovieStartMethod],0 - GUIPButtonHole 43,127,byte[MovieStartMethod],1 - GUIPButtonHole 88,127,byte[MovieStartMethod],2 - GUIPButtonHole 8,137,byte[MovieStartMethod],3 + GUIPButtonHole 8,137,byte[MovieStartMethod],0 + GUIPButtonHole 43,137,byte[MovieStartMethod],1 + GUIPButtonHole 88,137,byte[MovieStartMethod],2 + GUIPButtonHole 8,147,byte[MovieStartMethod],3 ret diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 2523b91c..5a2b5b96 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -4531,9 +4531,11 @@ DisplayGUIMovies: DrawGUIButton 15,7,17,49,28,GUIMovieText1,16,0,0 DrawGUIButton 15,7,33,49,44,GUIMovieText2,17,0,0 DrawGUIButton 15,7,49,49,60,GUIMovieText3,18,0,0 - DrawGUIButton 15,7,65,109,76,GUIMovieTextB,29,0,0 - DrawGUIButton 15,7,81,109,92,GUIMovieTextC,30,0,0 - DrawGUIButton 15,7,97,109,108,GUIMovieTextD,31,0,0 + DrawGUIButton 15,7,65,49,76,GUIMovieTextE,32,0,0 + DrawGUIButton 15,61,65,118,76,GUIMovieTextEa,33,0,0 + DrawGUIButton 15,7,81,109,92,GUIMovieTextB,29,0,0 + DrawGUIButton 15,7,97,109,108,GUIMovieTextC,30,0,0 + DrawGUIButton 15,7,113,109,124,GUIMovieTextD,31,0,0 cmp byte[GUIWincoladd],0 je .zero mov byte[GUItextcolor],211 @@ -4560,15 +4562,12 @@ DisplayGUIMovies: GUIOuttextwin2 15,131,43,GUIChoseSaveText2 mov byte[GUIChoseSaveText2],'9' GUIOuttextwin2 15,150,42,GUIChoseSaveText2 -; GUIOuttextwin2 15,9,121,GUIMovieTextE -; GUIOuttextwin2 15,9,131,GUIMovieTextF -; GUIOuttextwin2 15,9,141,GUIMovieTextG GUIOuttextwin2 15,71,55,GUIMovieTextI - GUIOuttextwin2 15,9,120,GUIMovieTextJ - GUIOuttextwin2 15,21,130,GUIMovieTextK - GUIOuttextwin2 15,56,130,GUIMovieTextL - GUIOuttextwin2 15,101,130,GUIMovieTextM - GUIOuttextwin2 15,21,140,GUIMovieTextN + GUIOuttextwin2 15,9,130,GUIMovieTextJ + GUIOuttextwin2 15,21,140,GUIMovieTextK + GUIOuttextwin2 15,56,140,GUIMovieTextL + GUIOuttextwin2 15,101,140,GUIMovieTextM + GUIOuttextwin2 15,21,150,GUIMovieTextN add byte[GUItextcolor],15 GUIOuttextwin2 15,60,15,GUIMovieText4 mov byte[GUIChoseSaveText2],'0' @@ -4591,15 +4590,12 @@ DisplayGUIMovies: GUIOuttextwin2 15,130,42,GUIChoseSaveText2 mov byte[GUIChoseSaveText2],'9' GUIOuttextwin2 15,150,42,GUIChoseSaveText2 -; GUIOuttextwin2 15,8,120,GUIMovieTextE -; GUIOuttextwin2 15,8,130,GUIMovieTextF -; GUIOuttextwin2 15,8,140,GUIMovieTextG GUIOuttextwin2 15,70,54,GUIMovieTextI - GUIOuttextwin2 15,8,119,GUIMovieTextJ - GUIOuttextwin2 15,20,129,GUIMovieTextK - GUIOuttextwin2 15,55,129,GUIMovieTextL - GUIOuttextwin2 15,100,129,GUIMovieTextM - GUIOuttextwin2 15,20,139,GUIMovieTextN + GUIOuttextwin2 15,8,129,GUIMovieTextJ + GUIOuttextwin2 15,20,139,GUIMovieTextK + GUIOuttextwin2 15,55,139,GUIMovieTextL + GUIOuttextwin2 15,100,139,GUIMovieTextM + GUIOuttextwin2 15,20,149,GUIMovieTextN GUIDisplayButtonHole 15,60,25,byte[CMovieExt],'v' GUIDisplayButtonHole 15,80,25,byte[CMovieExt],'1' GUIDisplayButtonHole 15,100,25,byte[CMovieExt],'2' @@ -4620,7 +4616,7 @@ DisplayGUIMovies: .zero3 mov al,byte[GUIGameOptnsColA] mov byte[GUItextcolor],al - GUIOuttextwin2 15,6,152,GUIMovieTextA + GUIOuttextwin2 15,6,162,GUIMovieTextA mov byte[GUIGameOptnsColA],163 mov byte[GUIGameOptnsColB],217 @@ -4631,25 +4627,26 @@ DisplayGUIMovies: .zero5 mov al,byte[GUIGameOptnsColA] mov byte[GUItextcolor],al - GUIOuttextwin2 15,5,151,GUIMovieTextA + GUIOuttextwin2 15,5,161,GUIMovieTextA + + DDrawBox 15,116,84,[KeyInsrtChap] + DDrawBox 15,116,100,[KeyPrevChap] + DDrawBox 15,116,116,[KeyNextChap] - DDrawBox 15,116,68,[KeyInsrtChap] - DDrawBox 15,116,84,[KeyPrevChap] - DDrawBox 15,116,100,[KeyNextChap] - DGOptnsBorderBox 15,115,67 DGOptnsBorderBox 15,115,83 DGOptnsBorderBox 15,115,99 - + DGOptnsBorderBox 15,115,115 + mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[MovieDisplayFrame],0 je .nocheckboxMDF mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckboxMDF GUIDisplayIconWin 15,60,50,[GUITemp] - GUIDisplayButtonHole 15,8,127,byte[MovieStartMethod],0 - GUIDisplayButtonHole 15,43,127,byte[MovieStartMethod],1 - GUIDisplayButtonHole 15,88,127,byte[MovieStartMethod],2 - GUIDisplayButtonHole 15,8,137,byte[MovieStartMethod],3 + GUIDisplayButtonHole 15,8,137,byte[MovieStartMethod],0 + GUIDisplayButtonHole 15,43,137,byte[MovieStartMethod],1 + GUIDisplayButtonHole 15,88,137,byte[MovieStartMethod],2 + GUIDisplayButtonHole 15,8,147,byte[MovieStartMethod],3 ret SECTION .data @@ -4666,9 +4663,10 @@ GUIMovieTextA db 'STATUS : ',0 GUIMovieTextB db 'INSERT CHAPTER',0 GUIMovieTextC db 'PREVIOUS CHAPTER',0 GUIMovieTextD db 'NEXT CHAPTER',0 -GUIMovieTextE db 'INSERT CHAPTER',0 -GUIMovieTextF db 'NEXT CHAPTER',0 -GUIMovieTextG db 'PREV CHAPTER',0 +GUIMovieTextE db 'APPEND',0 +GUIMovieTextEa db 'DUMP RAW',0 +;GUIMovieTextF db 'NEXT CHAPTER',0 +;GUIMovieTextG db 'PREV CHAPTER',0 ;GUIMovieTextH db ' ',0 GUIMovieTextI db 'DISPLAY FRAMES',0 GUIMovieTextJ db 'START FROM:',0