diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index e9eb0043..fd8e3def 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -650,6 +650,7 @@ NEWSYM RewindFrames, db 6 NEWSYM KeyInsrtChap, dd 0 NEWSYM KeyNextChap, dd 0 NEWSYM KeyPrevChap, dd 0 +NEWSYM MovieDisplayFrame, db 0 GUIsave equ $-GUIRAdd diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 8ae8755e..1e6070fb 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2122,6 +2122,7 @@ DisplayGUIMovieClick: DGOptnsProcBox 97,134,[KeyInsrtChap] DGOptnsProcBox 97,144,[KeyNextChap] DGOptnsProcBox 97,154,[KeyPrevChap] + GUIClickCButton 8,162,byte[MovieDisplayFrame] ret diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 763305e2..a6a9414c 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -5564,6 +5564,7 @@ DisplayGUIMovies: GUIOuttextwin2 15,9,136,GUIMovieTextE GUIOuttextwin2 15,9,146,GUIMovieTextF GUIOuttextwin2 15,9,156,GUIMovieTextG + GUIOuttextwin2 15,21,166,GUIMovieTextI add byte[GUItextcolor],15 GUIOuttextwin2 15,60,15,GUIMovieText4 GUIOuttextwin2 15,6,114,GUIMovieTextA @@ -5590,6 +5591,7 @@ DisplayGUIMovies: GUIOuttextwin2 15,8,135,GUIMovieTextE GUIOuttextwin2 15,8,145,GUIMovieTextF GUIOuttextwin2 15,8,155,GUIMovieTextG + GUIOuttextwin2 15,20,165,GUIMovieTextI GUIDisplayButtonHole 15,60,25,byte[CMovieExt],'v' GUIDisplayButtonHole 15,80,25,byte[CMovieExt],'1' GUIDisplayButtonHole 15,100,25,byte[CMovieExt],'2' @@ -5629,6 +5631,13 @@ DisplayGUIMovies: DGOptnsBorderBox 15,96,133 DGOptnsBorderBox 15,96,143 DGOptnsBorderBox 15,96,153 + + mov dword[GUITemp],GUIIconDataCheckBoxUC + cmp byte[MovieDisplayFrame],0 + je .nocheckboxMDF + mov dword[GUITemp],GUIIconDataCheckBoxC +.nocheckboxMDF + GUIDisplayIconWin 15,8,162,[GUITemp] ret SECTION .data @@ -5649,6 +5658,7 @@ GUIMovieTextE db 'INSERT CHAPTER',0 GUIMovieTextF db 'NEXT CHAPTER',0 GUIMovieTextG db 'PREV CHAPTER',0 GUIMovieTextH db 'MOVIE KEYS :',0 +GUIMovieTextI db 'DISPLAY FRAMES',0 NEWSYM CMovieExt, db 'v' SECTION .text diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm index a103789e..8a0de2cb 100644 --- a/zsnes/src/video/procvid.asm +++ b/zsnes/src/video/procvid.asm @@ -69,7 +69,7 @@ EXTSYM HalfTransB,HalfTransC EXTSYM cur_zst_size,old_zst_size EXTSYM MovieProcessing,mzt_chdir,UpChdir -EXTSYM MovieFrameStr,GetMovieFrameStr +EXTSYM MovieFrameStr,GetMovieFrameStr,MovieDisplayFrame %ifdef __MSDOS__ EXTSYM SB_blank @@ -3571,6 +3571,8 @@ NEWSYM copyvid .nomsg cmp byte[MovieProcessing],0 jz .nomovie4 + cmp byte[MovieDisplayFrame],0 + jz .nomovie4 pushad call GetMovieFrameStr popad