diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 3c4fbd74..c2822e4d 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -409,7 +409,7 @@ NEWSYM CalibYmin209, dd 0 NEWSYM CalibXmax209, dd 0 NEWSYM CalibYmax209, dd 0 NEWSYM maxskip, db 9 -FPSAtStart db 0 +NEWSYM FPSAtStart, db 0 NEWSYM SidewinderFix, db 0 GUIInitSt1 db 'ATZ' .rest times 47 db 0 @@ -926,11 +926,6 @@ NEWSYM GUIRestoreVars mov [smallscreenon],al mov al,[GUIScreenScale] mov [ScreenScale],al - cmp byte[newengen],1 - jne .nofpsatstart - mov al,[FPSAtStart] - mov [FPSOn],al -.nofpsatstart call CalcChecksum cmp byte[TimeChecker],bl jne .nottimer diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm index 3b821185..fdaf09ea 100644 --- a/zsnes/src/ui.asm +++ b/zsnes/src/ui.asm @@ -21,6 +21,7 @@ EXTSYM getcfg,soundon,SBHDMA,StereoSound,init,GUIRestoreVars,GUIClick,MouseDis EXTSYM ConvertJoyMap,ConvertJoyMap1,ConvertJoyMap2,printhex,InitSPC EXTSYM StartUp,PrintStr,WaitForKey,PrintChar,ZFileSystemInit EXTSYM SPCDisable,SystemInit,allocmem +EXTSYM FPSOn,FPSAtStart EXTSYM xa EXTSYM SBPort,SBInt,SBIrq,SBDMA,SBDMAPage,SBHDMAPage,getenv,vibracard EXTSYM ram7fa,wramdataa @@ -93,6 +94,12 @@ NEWSYM zstart mov byte[soundon],0 mov byte[spcon],0 .nodissound + cmp byte[frameskip],0 + jne .nofpsatstart + mov al,[FPSAtStart] + mov [FPSOn],al + xor al,al +.nofpsatstart mov al,[gammalevel] shr al,1