From 98aedae304ba064294331cd94a5c19ae3a93bf18 Mon Sep 17 00:00:00 2001 From: dborth Date: Tue, 26 Jan 2010 06:00:19 +0000 Subject: [PATCH] sync with official --- source/fceultra/ines.cpp | 2 ++ source/fceultra/mappers/80.cpp | 3 ++- source/fceultra/movie.cpp | 7 ++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/source/fceultra/ines.cpp b/source/fceultra/ines.cpp index f52b38b..1207e2d 100644 --- a/source/fceultra/ines.cpp +++ b/source/fceultra/ines.cpp @@ -390,6 +390,8 @@ static void CheckHInfo(void) 0x1b084107d0878bd0LL, /* Startropics 2*/ 0x836c0ff4f3e06e45LL, /* Zelda 2 */ + + 0x82000965f04a71bbLL, /* Mirai Shinwa Jarvas */ 0 /* Abandon all hope if the game has 0 in the lower 64-bits of its MD5 hash */ }; diff --git a/source/fceultra/mappers/80.cpp b/source/fceultra/mappers/80.cpp index fa94941..954769f 100644 --- a/source/fceultra/mappers/80.cpp +++ b/source/fceultra/mappers/80.cpp @@ -87,7 +87,8 @@ static void booga(int version) void Mapper80_init(void) { - SetWriteHandler(0x4020,0x7fff,Mapper80_write); + SetWriteHandler(0x4020,0x7eff,Mapper80_write);// 7f00-7fff battery backed ram inside mapper chip, + // controlled by 7ef8 register, A8 - enable, FF - disable (?) MapStateRestore=booga; isfu=0; } diff --git a/source/fceultra/movie.cpp b/source/fceultra/movie.cpp index 8e10a23..3722736 100644 --- a/source/fceultra/movie.cpp +++ b/source/fceultra/movie.cpp @@ -135,9 +135,14 @@ void MovieData::TryDumpIncremental() { currMovieData.insertEmpty(-1,1); } - + MovieData::dumpSavestateTo(&currMovieData.records[currFrameCounter].savestate,Z_DEFAULT_COMPRESSION); currMovieData.greenZoneCount++; + } else if (currFrameCounter < currMovieData.greenZoneCount || !movie_readonly) + { + if (turbo && pauseframe-256>currFrameCounter && ((currFrameCounter-pauseframe)&0xff)) + return; + MovieData::dumpSavestateTo(&currMovieData.records[currFrameCounter].savestate,Z_DEFAULT_COMPRESSION); } } #endif