X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=89a54a360b7989bf0b7e6222b2be5dfcaf1c573a;hp=7cc5996853fa14c3b48c72959e70a25e2cfaaee2;hb=892b1f6c68346fa00dc3029ab8bd31178e730509;hpb=21afaa365c97896da6ccbdd6540e20f2d2bb4990

diff --git a/fce.c b/fce.c
index 7cc5996..89a54a3 100644
--- a/fce.c
+++ b/fce.c
@@ -39,6 +39,7 @@
 #include	"fds.h"
 #include	"ines.h"
 #include	"unif.h"
+#include	"vsuni.h"
 #include        "cheat.h"
 
 #include	"state.h"
@@ -145,6 +146,8 @@ void asmcpu_unpack(void)
 	X6502_Rebase_a();
 	nes_registers[4] = X.S << 24;
 	nes_registers[4]|= X.IRQlow << 8;
+	if (MapIRQHook)
+		nes_registers[4] |= 1<<16; // MapIRQHook set bit
 	nes_registers[7] = (uint32)X.count << 16;
 
 	// NVUB DIZC
@@ -604,11 +607,25 @@ void FCEUI_FrameSkip(int x)
 static void LineUpdate(uint8 *target)
 {
 	uint32 tem;
+	int y;
 
-	if(FSkip || scanline < FSettings.FirstSLine || scanline > FSettings.LastSLine)
+	/* PRefreshLine() will not get called on skipped frames.  This
+	 * could cause a problem, but the solution would be rather complex,
+	 * due to the current sprite 0 hit code.
+	 */
+	if(FSkip)
+	{
+	 y=(int)SPRAM[0] + 1;
+	 if(scanline==y && SpriteON) PPU_status|=0x40; // hack
+	 return;
+	}
+
+	if(scanline < FSettings.FirstSLine || scanline > FSettings.LastSLine)
 	{
 	   if(PPU_hook)
  	    PRefreshLine();
+	   y=(int)SPRAM[0] + 1;
+	   if(scanline==y && SpriteON) PPU_status|=0x40;
 	}
 	else
 	{
@@ -678,27 +695,29 @@ static void LineUpdateEnd(uint8 *target)
 
 static void PRefreshLine(void)
 {
-        uint32 vofs;
-        uint8 X1;
+         uint32 vofs;
+	 int X1;
+	 vofs=((PPU[0]&0x10)<<8) | ((RefreshAddr>>12)&7);
+	 void (*PPU_hook_)(uint32 A) = PPU_hook;
 
-        vofs = 0;
-        if (BGAdrHI) vofs = 0x1000;
 
-        vofs+=(RefreshAddr>>12)&7;
+         for(X1=33;X1;X1--)
+         {
+                uint32 zz2;
+                uint32 vadr;
+
+                zz2=(RefreshAddr>>10)&3;
+                PPU_hook_(0x2000|(RefreshAddr&0xFFF));
+
+                vadr=(vnapage[zz2][RefreshAddr&0x3ff]<<4)+vofs;
+
+	        PPU_hook_(vadr);
 
-        for(X1=33;X1;X1--)
-        {
-                register uint8 no;
-                register uint8 zz2;
-                zz2=(uint8)((RefreshAddr>>10)&3);
-		PPU_hook(0x2000|(RefreshAddr&0xFFF));
-                no  = vnapage[zz2][(RefreshAddr&0x3ff)];
-                PPU_hook((no<<4)+vofs);
                 if((RefreshAddr&0x1f)==0x1f)
                  RefreshAddr^=0x41F;
                 else
                  RefreshAddr++;
-        }
+         }
 }
 
 /* This high-level graphics MMC5 emulation code was written
@@ -856,30 +875,34 @@ static void RefreshLine_MMC5Hack4(uint8 *P, uint32 vofs)
 static void RefreshLine_PPU_hook(uint8 *P, uint32 vofs)
 {
          int8 X1;
+	 void (*PPU_hook_)(uint32 A) = PPU_hook;
+	 uint32 rfraddr = RefreshAddr;
+	 uint8 *page = vnapage[(rfraddr>>10)&3];
 
          for(X1=33;X1;X1--,P+=8)
          {
                 uint8 *C;
-                uint8 cc,zz,zz2;
+                uint8 cc,zz;
                 uint32 vadr;
 
-                zz=RefreshAddr&0x1F;
-                zz2=(RefreshAddr>>10)&3;
-                PPU_hook(0x2000|(RefreshAddr&0xFFF));
-                cc=vnapage[zz2][0x3c0+(zz>>2)+((RefreshAddr&0x380)>>4)];
-                cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2;
-                vadr=(vnapage[zz2][RefreshAddr&0x3ff]<<4)+vofs;
+                zz=rfraddr&0x1F;
+                PPU_hook_(0x2000|(rfraddr&0xFFF));
+                cc=page[0x3c0+(zz>>2)+((rfraddr&0x380)>>4)];
+                cc=((cc >> ((zz&2) + ((rfraddr&0x40)>>4))) &3) <<2;
+                vadr=(page[rfraddr&0x3ff]<<4)+vofs;
                 C = VRAMADR(vadr);
 
 	        #include "fceline.h"
 
-	        PPU_hook(vadr);
+	        PPU_hook_(vadr);
 
-                if((RefreshAddr&0x1f)==0x1f)
-                 RefreshAddr^=0x41F;
-                else
-                 RefreshAddr++;
+                if((rfraddr&0x1f)==0x1f) {
+                 rfraddr^=0x41F;
+	         page = vnapage[(rfraddr>>10)&3];
+                } else
+                 rfraddr++;
          }
+	 RefreshAddr = rfraddr;
 }
 
 static void RefreshLine_normal(uint8 *P, uint32 vofs) // vofs is 0x107 max
@@ -1086,7 +1109,7 @@ int NSFLoad(int fp);
 FCEUGI *FCEUI_LoadGame(char *name)
 {
 	char name2[512];
-	int have_movie = 0;
+	int have_movie = 0, have_ips = 0;
         int fp;
 
         //Exit=1;
@@ -1106,24 +1129,39 @@ FCEUGI *FCEUI_LoadGame(char *name)
 
         {
 	 char *p = name2 + strlen(name2) - 4;
-	 if (strcmp(p, ".fcm") == 0)
+	 if (strcasecmp(p, ".fcm") == 0) printf("movie detected\n"), have_movie = 1;
+	 if (strcasecmp(p, ".ips") == 0) printf("ips detected\n"), have_ips = 1;
+	 if (have_movie || have_ips)
 	 {
 	  // movie detected
-	  printf("movie detected\n");
 	  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 && p - name2 > 2)
+	  {
+	   for (p--; p > name2 && *p != '.'; p--);
+           *p = 0;
+	   fp=FCEU_fopen(name2,"rb");
+	  }
 	  if (!fp) {
-	   printf("no ROM for movie\n");
+	   printf("no ROM for ips/movie\n");
 	   LoadGameLastError = 2;
 	   return 0;
 	  }
-	  have_movie = 1;
 	 }
 	}
 
+	// do IPS patch
+	if (have_ips)
+	{
+	 FCEU_fclose(fp);
+	 FILE *ips = fopen(name, "rb");
+	 if (!ips) return 0;
+         fp=FCEU_fopen_forcemem(name2);
+	 if (!fp) { fclose(ips); return 0; }
+	 ApplyIPS(ips, fp); // closes ips
+	}
+
         GetFileBase(name2);
         if(iNESLoad(name2,fp))
          goto endlseq;
@@ -1370,6 +1408,12 @@ void EmLoop(void)
   }
 
 update:
+  if(Exit)
+  {
+   //CloseGame();
+   break;
+  }
+
   {
    int ssize;
 
@@ -1393,12 +1437,6 @@ update:
    }
   }
 
-  if(Exit)
-  {
-   //CloseGame();
-   break;
-  }
-
  } // for
 }
 
@@ -1494,15 +1532,18 @@ void PowerNES(void)
         memset(RAM,0x00,0x800);
 #endif
         ResetMapping();
-	GameInterface(GI_POWER, 0);
         PowerSound();
 	PowerPPU();
-	timestampbase=0;
+	GameInterface(GI_POWER, 0);
+        if(FCEUGameInfo.type==GIT_VSUNI)
+         FCEU_VSUniPower();
 #ifdef ASM_6502
 	if (geniestage)
 	 GenieSetPages(0);
 #endif
+	timestampbase=0;
 	X6502_Power();
+	FCEU_PowerCheats();
 }