diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm index a9f8bcdb..67aaca59 100644 --- a/zsnes/src/init.asm +++ b/zsnes/src/init.asm @@ -22,7 +22,7 @@ EXTSYM DosExit,UpdateDevices,InitSPC,Makemode7Table,MusicRelVol,MusicVol EXTSYM makesprprtable,romloadskip,start65816,startdebugger,SfxR0 -EXTSYM MovieProcessing,showinfogui +EXTSYM showinfogui EXTSYM filefound,inittable,SA1inittable EXTSYM MessageOn,Msgptr,MsgCount,sndrot,GenerateBank0Table,SnowTimer EXTSYM inittableb,inittablec,newgfx16b,cfgreinittime @@ -526,7 +526,6 @@ NEWSYM WhichGR, resb 1 NEWSYM autofr, resb 1 TurboCB resb 1 -NEWSYM MovieTemp, resb 1 NEWSYM JoyAOrig, resd 1 NEWSYM JoyBOrig, resd 1 NEWSYM JoyCOrig, resd 1 diff --git a/zsnes/src/zmovie.c b/zsnes/src/zmovie.c index 8496ffcf..d2572746 100644 --- a/zsnes/src/zmovie.c +++ b/zsnes/src/zmovie.c @@ -949,7 +949,7 @@ MovieProcessing extern unsigned int MsgCount, MessageOn; -extern unsigned char MovieTemp, MovieProcessing, *Msgptr; +extern unsigned char MovieProcessing, *Msgptr; char *txtmovieended = "MOVIE FINISHED."; void MovieInsertChapter() @@ -999,11 +999,6 @@ void Replay() } } -unsigned int bytemerger (unsigned char heaviest, unsigned char heavy, unsigned char light, unsigned char lightest) -{ - return ((heaviest << 24) | (heavy << 16) | (light << 8) | (lightest)); -} - void ProcessMovies() { if (MovieProcessing == 2) { zmv_record(); } @@ -1013,7 +1008,6 @@ void ProcessMovies() // The following will maybe end up in guic.c once we get it started. // It came from guiwindp.inc and gui.asm, after all extern unsigned char MovieRecordWinVal; -extern unsigned int GUICBHold; void SkipMovie() {