X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=fce.c;h=4db2a0a57e8bea9e64a09f719b1deca97fb7b601;hp=53abd9374ea7d1ffc0b6c5a25b7ff950b2f6a1c5;hb=92764e6252a3691033d6044b466bf716c96b62d5;hpb=890e37ba2b8ea1c7593dc05926d7431e3bd00bfb

diff --git a/fce.c b/fce.c
index 53abd93..4db2a0a 100644
--- a/fce.c
+++ b/fce.c
@@ -48,6 +48,7 @@
 #include	"crc32.h"
 #include        "ppu.h"
 
+#include        "palette.h"
 #include        "movie.h"
 
 #include        "dprintf.h"
@@ -97,7 +98,7 @@ void (*GameInterface)(int h);
 void FP_FASTAPASS(1) (*PPU_hook)(uint32 A);
 
 void (*GameStateRestore)(int version);
-void (*GameHBIRQHook)(void);
+void (*GameHBIRQHook)(void), (*GameHBIRQHook2)(void);
 
 readfunc ARead[0x10000];
 writefunc BWrite[0x10000];
@@ -353,7 +354,7 @@ static DECLFR(A2002)
                         vtoggle=0;
                         PPU_status&=0x7F;
 			 PPUGenLatch=ret;
-			dprintf("r [2002] %02x",ret);
+			//dprintf("r [2002] %02x",ret);
                         return ret;
 }
 
@@ -959,7 +960,7 @@ static void DoHBlank(void)
 {
  if(ScreenON || SpriteON)
   FetchSpriteData();
- if(GameHBIRQHook && (ScreenON || SpriteON))
+ if(GameHBIRQHook && (ScreenON || SpriteON) && ((PPU[0]&0x38)!=0x18))
  {
   X6502_Run(6);
   Fixit2();
@@ -973,10 +974,13 @@ static void DoHBlank(void)
   Fixit2();
   X6502_Run(85-6-16);
  }
+ if(GameHBIRQHook2 && (ScreenON || SpriteON))
+  GameHBIRQHook2();
  //PPU_hook(0,-1);
  //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr);
  scanline++;
- ResetRL();
+ if (scanline<240)
+  ResetRL();
  X6502_Run(16);
 }
 
@@ -1029,7 +1033,7 @@ void CloseGame(void)
  if(GameLoaded)
  {
   if(FCEUGameInfo.type!=GIT_NSF)
-   FlushGameCheats();
+   FCEU_FlushGameCheats(0,0);
   #ifdef NETWORK
   if(FSettings.NetworkPlay) KillNetplay();
   #endif
@@ -1044,7 +1048,7 @@ void ResetGameLoaded(void)
         if(GameLoaded) CloseGame();
         GameStateRestore=0;
         PPU_hook=0;
-        GameHBIRQHook=0;
+        GameHBIRQHook=GameHBIRQHook2=0;
 	GameExpSound.Fill=0;
 	GameExpSound.RChange=0;
         if(GameExpSound.Kill)
@@ -1063,6 +1067,10 @@ void ResetGameLoaded(void)
 }
 
 char lastLoadedGameName [2048];
+int UNIFLoad(const char *name, int fp);
+int iNESLoad(const char *name, int fp);
+int FDSLoad(const char *name, int fp);
+int NSFLoad(int fp);
 
 FCEUGI *FCEUI_LoadGame(char *name)
 {
@@ -1132,8 +1140,8 @@ FCEUGI *FCEUI_LoadGame(char *name)
         SaveStateRefresh();
         if(FCEUGameInfo.type!=GIT_NSF)
         {
-         LoadGamePalette();
-         LoadGameCheats();
+	 FCEU_LoadGamePalette();
+         FCEU_LoadGameCheats(0);
         }
 
 	FCEU_ResetPalette();
@@ -1180,14 +1188,17 @@ int FCEUI_Initialize(void)
 	FSettings.UsrFirstSLine[0]=8;
 	FSettings.UsrFirstSLine[1]=0;
         FSettings.UsrLastSLine[0]=FSettings.UsrLastSLine[1]=239;
-	FSettings.SoundVolume=65535;	// 100%
+	FSettings.SoundVolume=100;
         return 1;
 }
 
+void MMC5_hb(int);     /* Ugh ugh ugh. */
 static INLINE void Thingo(void)
 {
    Loop6502();
 
+   if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline);
+
    // check: Battletoads & Double Dragon
    if(tosprite>=256)
    {
@@ -1209,21 +1220,20 @@ void EmLoop(void)
 {
  for(;;)
  {
+  int x;
   uint32 scanlines_per_frame = PAL ? 312 : 262;
   UpdateInput();
-  ApplyPeriodicCheats();
+  FCEU_ApplyPeriodicCheats();
 
   // FCEUPPU_Loop:
   if(ppudead) /* Needed for Knight Rider, possibly others. */
   {
-   memset(XBuf, 0x80, 256*240);
+   memset(XBuf, 0x80, 320*240);
    X6502_Run(scanlines_per_frame*(256+85));
    ppudead--;
    goto update;
   }
-	//extern int asdc;
-	//printf("asdc: %i\n", asdc);
-	//asdc=0;
+
   X6502_Run(256+85);
 
   PPU[2]|=0x80;
@@ -1236,7 +1246,7 @@ void EmLoop(void)
 				   of this delay.
 			 	*/
   if(FCEUGameInfo.type==GIT_NSF)
-   TriggerNMINSF();
+   DoNSFFrame();
   else if(VBlankON)
    TriggerNMI();
 
@@ -1249,14 +1259,19 @@ void EmLoop(void)
      X6502_Run(256+85);
   }
   // X6502_Run((scanlines_per_frame-242)*(256+85)-12);
-
   PPU_status&=0x1f;
-
   X6502_Run(256);
+
   {
    if(ScreenON || SpriteON)
+   {
     if(GameHBIRQHook)
      GameHBIRQHook();
+     if(PPU_hook)
+      for(x=0;x<42;x++) {PPU_hook(0x2000); PPU_hook(0);} // ugh
+    if(GameHBIRQHook2)
+     GameHBIRQHook2();
+   }
 
    X6502_Run(85-16);
 
@@ -1275,6 +1290,37 @@ void EmLoop(void)
   {
    X6502_Run((256+85)*240);
   }
+  #ifdef FRAMESKIP
+   else if(FSkip)
+   {
+    int y;
+
+    y=SPRAM[0];
+    y++;
+
+    PPU_status|=0x20;       // Fixes "Bee 52".  Does it break anything?
+    if(GameHBIRQHook)
+    {
+     X6502_Run(256);
+     for(scanline=0;scanline<240;scanline++)
+     {
+      if(ScreenON || SpriteON)
+       GameHBIRQHook();
+      if(scanline==y && SpriteON) PPU_status|=0x40;
+      X6502_Run((scanline==239)?85:(256+85));
+      ResetRL(); // ??
+     }
+    }
+    else if(y<240)
+    {
+     X6502_Run((256+85)*y);
+     if(SpriteON) PPU_status|=0x40; // Quick and very dirty hack.
+     X6502_Run((256+85)*(240-y));
+    }
+    else
+     X6502_Run((256+85)*240);
+   }
+  #endif
   else
   {
    int x,max,maxref;
@@ -1286,6 +1332,7 @@ void EmLoop(void)
     deempcnt[deemp]++;
     Thingo();
    }
+   if(MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline);
    for(x=1,max=0,maxref=0;x<7;x++)
    {
     if(deempcnt[x]>max)
@@ -1295,8 +1342,6 @@ void EmLoop(void)
     }
     deempcnt[x]=0;
    }
-   //FCEU_DispMessage("%2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x %d",deempcnt[0],deempcnt[1],deempcnt[2],deempcnt[3],deempcnt[4],deempcnt[5],deempcnt[6],deempcnt[7],maxref);
-   //memset(deempcnt,0,sizeof(deempcnt));
    SetNESDeemph(maxref,0);
   }
 
@@ -1391,7 +1436,7 @@ static void PowerPPU(void)
 
 void ResetNES(void)
 {
-        if(!GameLoaded || (FCEUGameInfo.type==GIT_NSF)) return;
+        if(!GameLoaded) return;
         GameInterface(GI_RESETM2);
         ResetSound();
         ResetPPU();