X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=5ad965ddc344a8c66216f5f59f953977c9b6c545;hp=a5cc4b0eb6111efe00cdcc5db4d61281a83bb556;hb=f12b1f316ca070bda860108b4e3901628d1a8398;hpb=0b65fdb3548fd54670265adfb80706e63da6b641

diff --git a/fce.c b/fce.c
index a5cc4b0..5ad965d 100644
--- a/fce.c
+++ b/fce.c
@@ -203,6 +203,9 @@ void FlushGenieRW(void)
    ARead[x+0x8000]=AReadG[x];
    BWrite[x+0x8000]=BWriteG[x];
   }
+#ifdef ASM_6502
+  GenieSetPages(1);
+#endif
   free(AReadG);
   free(BWriteG);
   AReadG=0;
@@ -559,7 +562,6 @@ void BGRender(uint8 *target)
 }
 
 #ifdef FRAMESKIP
-int FSkip_setting=-1; // auto
 int FSkip=0;
 void FCEUI_FrameSkip(int x)
 {
@@ -975,9 +977,9 @@ static void DoHBlank(void)
  {
   X6502_Run(6);
   Fixit2();
-  X6502_Run(4);
+  X6502_Run(4+3);	// original value was 4, but adding 3 fixes glitch in smb3 (and breaks something?)
   GameHBIRQHook();
-  X6502_Run(85-16-10);
+  X6502_Run(85-10-16-3);
  }
  else
  {
@@ -1078,6 +1080,7 @@ void ResetGameLoaded(void)
 }
 
 char lastLoadedGameName [2048];
+int LoadGameLastError = 0;
 int UNIFLoad(const char *name, int fp);
 int iNESLoad(const char *name, int fp);
 int FDSLoad(const char *name, int fp);
@@ -1089,7 +1092,8 @@ FCEUGI *FCEUI_LoadGame(char *name)
 	int have_movie = 0;
         int fp;
 
-        Exit=1;
+        //Exit=1;
+	LoadGameLastError = 0;
         ResetGameLoaded();
 
 	strncpy(name2, name, sizeof(name2));
@@ -1099,6 +1103,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
 	if(!fp)
         {
  	 FCEU_PrintError("Error opening \"%s\"!",name);
+	 LoadGameLastError = 1;
 	 return 0;
 	}
 
@@ -1111,16 +1116,17 @@ FCEUGI *FCEUI_LoadGame(char *name)
 	  FCEU_fclose(fp);
 	  *p = 0;
 	  fp=FCEU_fopen(name2,"rb");
+	  if (!fp && p - name2 > 2)  p[-2] = 0;
+	  fp=FCEU_fopen(name2,"rb");
 	  if (!fp) {
 	   printf("no ROM for movie\n");
+	   LoadGameLastError = 2;
 	   return 0;
 	  }
 	  have_movie = 1;
 	 }
 	}
 
-	strcpy(lastLoadedGameName, name2);
-
         GetFileBase(name2);
         if(iNESLoad(name2,fp))
          goto endlseq;
@@ -1133,6 +1139,8 @@ FCEUGI *FCEUI_LoadGame(char *name)
 
         FCEU_PrintError("An error occurred while loading the file.");
         FCEU_fclose(fp);
+	// format handlers may set LoadGameLastError themselves.
+	if (LoadGameLastError == 0) LoadGameLastError = 3;
         return 0;
 
         endlseq:
@@ -1160,6 +1168,9 @@ FCEUGI *FCEUI_LoadGame(char *name)
 
 	if (have_movie)
 		FCEUI_LoadMovie(name, 1);
+
+	strcpy(lastLoadedGameName, name2);
+
         return(&FCEUGameInfo);
 }
 
@@ -1210,14 +1221,17 @@ static INLINE void Thingo(void)
 
    if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline);
 
-   // check: Battletoads & Double Dragon
+   // check: Battletoads & Double Dragon, Addams Family
+   // sky glitches in SMB1 if done wrong
    if(tosprite>=256)
    {
     X6502_Run(256);
    }
    else
    {
-     // sky glitches in SMB1 if done wrong
+     // a dirty hack for Addams Family and inaccurate sprite hit emulation
+     if(tosprite<8) tosprite-=tosprite*3>>2;
+
      X6502_Run(tosprite);
      PPU[2]|=0x40;
      X6502_Run(256-tosprite);
@@ -1353,7 +1367,7 @@ update:
 
   if(Exit)
   {
-   CloseGame();
+   //CloseGame();
    break;
   }
 
@@ -1425,6 +1439,18 @@ void ResetNES(void)
         X6502_Reset();
 }
 
+static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
+{
+ int x=0;
+ while(size)
+ {
+  *ptr=(x&4)?0xFF:0x00;
+  x++;
+  size--;
+  ptr++;
+ }
+}
+
 void PowerNES(void)
 {
         if(!GameLoaded) return;
@@ -1434,12 +1460,20 @@ void PowerNES(void)
 
         GeniePower();
 
+#ifndef DEBUG_ASM_6502
+        FCEU_MemoryRand(RAM,0x800);
+#else
         memset(RAM,0x00,0x800);
+#endif
         ResetMapping();
 	GameInterface(GI_POWER);
         PowerSound();
 	PowerPPU();
 	timestampbase=0;
+#ifdef ASM_6502
+	if (geniestage)
+	 GenieSetPages(0);
+#endif
 	X6502_Power();
 }