diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index fd8e3def..21a2a195 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -651,6 +651,7 @@ NEWSYM KeyInsrtChap, dd 0 NEWSYM KeyNextChap, dd 0 NEWSYM KeyPrevChap, dd 0 NEWSYM MovieDisplayFrame, db 0 +NEWSYM MovieStartMethod, db 0 GUIsave equ $-GUIRAdd @@ -680,9 +681,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 ,50 ,3 ,50 ,50 ,5 ,20 -GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,20 ,20 ,20 ,60 ,30 ,65 ,30 ,22 ,60 ,60 ,20 ,60 +GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,20 ,20 ,20 ,60 ,30 ,65 ,20 ,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,160 ,250 ,160 ,160 ,244 ,200 -GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,189 ,150 ,190 ,42 ,40 ,42 ,180 ,190 ,100 ,100 ,190 ,150 +GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,189 ,150 ,190 ,42 ,40 ,42 ,190 ,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 1e6070fb..b665a18f 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2123,6 +2123,9 @@ DisplayGUIMovieClick: DGOptnsProcBox 97,144,[KeyNextChap] DGOptnsProcBox 97,154,[KeyPrevChap] GUIClickCButton 8,162,byte[MovieDisplayFrame] + GUIPButtonHole 8,183,byte[MovieStartMethod],0 + GUIPButtonHole 43,183,byte[MovieStartMethod],1 + GUIPButtonHole 88,183,byte[MovieStartMethod],2 ret diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index a6a9414c..df270b57 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -5564,7 +5564,11 @@ DisplayGUIMovies: GUIOuttextwin2 15,9,136,GUIMovieTextE GUIOuttextwin2 15,9,146,GUIMovieTextF GUIOuttextwin2 15,9,156,GUIMovieTextG - GUIOuttextwin2 15,21,166,GUIMovieTextI + GUIOuttextwin2 15,21,166,GUIMovieTextI + GUIOuttextwin2 15,9,176,GUIMovieTextJ + GUIOuttextwin2 15,21,186,GUIMovieTextK + GUIOuttextwin2 15,56,186,GUIMovieTextL + GUIOuttextwin2 15,101,186,GUIMovieTextM add byte[GUItextcolor],15 GUIOuttextwin2 15,60,15,GUIMovieText4 GUIOuttextwin2 15,6,114,GUIMovieTextA @@ -5591,7 +5595,11 @@ DisplayGUIMovies: GUIOuttextwin2 15,8,135,GUIMovieTextE GUIOuttextwin2 15,8,145,GUIMovieTextF GUIOuttextwin2 15,8,155,GUIMovieTextG - GUIOuttextwin2 15,20,165,GUIMovieTextI + GUIOuttextwin2 15,20,165,GUIMovieTextI + GUIOuttextwin2 15,8,175,GUIMovieTextJ + GUIOuttextwin2 15,20,185,GUIMovieTextK + GUIOuttextwin2 15,55,185,GUIMovieTextL + GUIOuttextwin2 15,100,185,GUIMovieTextM GUIDisplayButtonHole 15,60,25,byte[CMovieExt],'v' GUIDisplayButtonHole 15,80,25,byte[CMovieExt],'1' GUIDisplayButtonHole 15,100,25,byte[CMovieExt],'2' @@ -5638,6 +5646,9 @@ DisplayGUIMovies: mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckboxMDF GUIDisplayIconWin 15,8,162,[GUITemp] + GUIDisplayButtonHole 15,8,183,byte[MovieStartMethod],0 + GUIDisplayButtonHole 15,43,183,byte[MovieStartMethod],1 + GUIDisplayButtonHole 15,88,183,byte[MovieStartMethod],2 ret SECTION .data @@ -5659,6 +5670,10 @@ GUIMovieTextF db 'NEXT CHAPTER',0 GUIMovieTextG db 'PREV CHAPTER',0 GUIMovieTextH db 'MOVIE KEYS :',0 GUIMovieTextI db 'DISPLAY FRAMES',0 +GUIMovieTextJ db 'START FROM:',0 +GUIMovieTextK db 'NOW',0 +GUIMovieTextL db 'POWER',0 +GUIMovieTextM db 'RESET',0 NEWSYM CMovieExt, db 'v' SECTION .text