From 23bc512daeaf14121d8b79f07d47ab2e3e179737 Mon Sep 17 00:00:00 2001
From: grinvader <>
Date: Fri, 13 May 2005 23:34:21 +0000
Subject: [PATCH] Fastforward no longer causes trouble if frame increase is
 used.

---
 zsnes/src/cpu/execute.asm | 3 ++-
 zsnes/src/vcache.asm      | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 68c9c02a..fc013c6d 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -55,7 +55,7 @@ EXTSYM fxbit67pcal,SfxSFR,nosprincr,cpucycle,switchtovirqdeb,switchtonmideb
 EXTSYM MovieSeekBehind,SaveSramData,BackupCVFrame,RestoreCVFrame,loadstate
 EXTSYM KeyInsrtChap,KeyNextChap,KeyPrevChap,MovieInsertChapter,MovieSeekAhead
 EXTSYM ResetDuringMovie,EMUPauseKey,INCRFrameKey,MovieWaiting,NoInputRead
-EXTSYM AllocatedRewindStates,SlowDownLock
+EXTSYM AllocatedRewindStates,SlowDownLock,FastForwardLock
 
 %ifdef __MSDOS__
 EXTSYM dssel
@@ -1433,6 +1433,7 @@ NEWSYM cpuover
     cmp byte[EMUPause],1
     jne .noemupause
     mov byte[SlowDownLock],0 ; prevents some random desyncs
+    mov byte[FastForwardLock],0 ; prevents some random desyncs
 
     call ProcessRewind
 
diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm
index 1fcf9339..e3908064 100644
--- a/zsnes/src/vcache.asm
+++ b/zsnes/src/vcache.asm
@@ -231,9 +231,8 @@ SECTION .data
 SaveRamSaved db 'SAVED SRAM DATA',0
 
 SECTION .bss
-FastForwardLock resb 1
+NEWSYM FastForwardLock, resb 1
 NEWSYM SlowDownLock, resb 1
-FastForwardLockp resb 1
 NEWSYM CSprWinPtr, resd 1
 NEWSYM SloMo, resb 1  ; number of extra times to draw a frame
 section .text