move 2
[fceu.git] / fce.c
diff --git a/fce.c b/fce.c
index 653a3f6..214a41f 100644 (file)
--- a/fce.c
+++ b/fce.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 1998 BERO 
+ *  Copyright (C) 1998 BERO
  *  Copyright (C) 2002 Ben Parnell
  *
  * This program is free software; you can redistribute it and/or modify
 #include       "input.h"
 #include       "file.h"
 #include       "crc32.h"
+#include        "ppu.h"
 
 #define Pal     (PALRAM)
 
-static void FetchSpriteData(void);
+
 static void FASTAPASS(1) RefreshLine(uint8 *target);
 static void PRefreshLine(void);
-static void FASTAPASS(1) RefreshSprite(uint8 *target);
+
 static void ResetPPU(void);
 static void PowerPPU(void);
 
@@ -62,7 +63,7 @@ int MMC5Hack;
 uint32 MMC5HackVROMMask;
 uint8 *MMC5HackExNTARAMPtr;
 uint8 *MMC5HackVROMPTR;
-uint8 MMC5HackCHRMode=0; 
+uint8 MMC5HackCHRMode=0;
 uint8 MMC5HackSPMode;
 uint8 MMC5HackSPScroll;
 uint8 MMC5HackSPPage;
@@ -81,7 +82,7 @@ uint8 PPUCHRRAM;
 static uint8 deemp=0;
 static int deempcnt[8];
 
-static int tosprite=256;
+int tosprite=256;
 
 FCEUGI FCEUGameInfo;
 void (*GameInterface)(int h);
@@ -198,7 +199,6 @@ uint8 XOffset=0;
 
 uint32 TempAddr,RefreshAddr;
 
-static int maxsprites=8;
 
 /* scanline is equal to the current visible scanline we're on. */
 
@@ -209,17 +209,17 @@ uint8 PPU[4];
 uint8 PPUSPL;
 
 uint8 GameMemBlock[131072];
-uint8 NTARAM[0x800],PALRAM[0x20],SPRAM[0x100],SPRBUF[0x100];
+uint8 NTARAM[0x800],PALRAM[0x20];
 uint8 RAM[0x800];
 
 uint8 PAL=0;
 
-#define MMC5SPRVRAMADR(V)      &MMC5SPRVPage[(V)>>10][(V)]
+
 #define MMC5BGVRAMADR(V)      &MMC5BGVPage[(V)>>10][(V)]
 #define        VRAMADR(V)      &VPage[(V)>>10][(V)]
+
 static DECLFW(BRAML)
-{  
+{
         RAM[A]=V;
 }
 
@@ -238,7 +238,7 @@ static DECLFR(ARAMH)
         return RAM[A&0x7FF];
 }
 
-           
+
 static DECLFR(A2002)
 {
                         uint8 ret;
@@ -260,11 +260,11 @@ static DECLFR(A2007)
 
                         PPUGenLatch=ret=VRAMBuffer;
                        if(PPU_hook) PPU_hook(tmp);
-                        if(tmp<0x2000) 
+                        if(tmp<0x2000)
                        {
                         VRAMBuffer=VPage[tmp>>10][tmp];
                        }
-                        else 
+                        else
                        {
                         VRAMBuffer=vnapage[(tmp>>10)&0x3][tmp&0x3FF];
                        }
@@ -320,6 +320,7 @@ static DECLFW(B2004)
                 PPUSPL++;
                }
                PPU[3]++;
+
 }
 
 static DECLFW(B2005)
@@ -365,7 +366,7 @@ static DECLFW(B2006)
 }
 
 static DECLFW(B2007)
-{  
+{
                        uint32 tmp=RefreshAddr&0x3FFF;
 
                         PPUGenLatch=V;
@@ -383,7 +384,7 @@ static DECLFW(B2007)
                             VPage[tmp>>10][tmp]=V;
                         }
                         else
-                       {                                               
+                       {
                          if(PPUNTARAM&(1<<((tmp&0xF00)>>10)))
                           vnapage[((tmp&0xF00)>>10)][tmp&0x3FF]=V;
                         }
@@ -393,7 +394,7 @@ static DECLFW(B2007)
 }
 
 static DECLFW(B4014)
-{                        
+{
        uint32 t=V<<8;
        int x;
        for(x=0;x<256;x++)
@@ -401,7 +402,7 @@ static DECLFW(B4014)
        X6502_AddCycles(512);
 }
 
-static void FASTAPASS(1) BGRender(uint8 *target)
+void BGRender(uint8 *target)
 {
        uint32 tem;
         RefreshLine(target);
@@ -414,7 +415,8 @@ static void FASTAPASS(1) BGRender(uint8 *target)
 }
 
 #ifdef FRAMESKIP
-static int FSkip=0;
+int FSkip_setting=-1; // auto
+int FSkip=0;
 void FCEUI_FrameSkip(int x)
 {
  FSkip=x;
@@ -464,7 +466,7 @@ static void Loop6502(void)
         {
         #endif
          if(PPU[1]&0x01)
-         { 
+         {
           for(x=63;x>=0;x--)
            *(uint32 *)&target[x<<2]=(*(uint32*)&target[x<<2])&0xF0F0F0F0;
          }
@@ -486,7 +488,7 @@ static void Loop6502(void)
        {
         tem=Pal[0]|(Pal[0]<<8)|(Pal[0]<<16)|(Pal[0]<<24);
         FCEU_dwmemset(target,tem,256);
-       }               
+       }
         if(InputScanlineHook)
          InputScanlineHook(target, scanline);
 }
@@ -524,10 +526,10 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
 {
        uint32 vofs;
         int X1;
-        register uint8 *P=target; 
+        uint8 *P=target;
 
        vofs=0;
-       
+
         Pal[0]|=64;
         Pal[4]|=64;
         Pal[8]|=64;
@@ -551,15 +553,15 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
           for(X1=33;X1;X1--,P+=8)
           {
                 uint8 *C;
-                register uint8 cc,zz,zz2;
+                uint8 cc,zz,zz2;
                 uint32 vadr;
 
-                if((tochange<=0 && MMC5HackSPMode&0x40) || 
+                if((tochange<=0 && MMC5HackSPMode&0x40) ||
                   (tochange>0 && !(MMC5HackSPMode&0x40)))
                 {
                  uint8 xs,ys;
 
-                 xs=33-X1; 
+                 xs=33-X1;
                  ys=((scanline>>3)+MMC5HackSPScroll)&0x1F;
                  if(ys>=0x1E) ys-=0x1E;
                  vadr=(MMC5HackExNTARAMPtr[xs|(ys<<5)]<<4)+(vofs&7);
@@ -597,8 +599,8 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
           for(X1=33;X1;X1--,P+=8)
           {
                 uint8 *C;
-                register uint8 cc;
-                register uint8 zz2;
+                uint8 cc;
+                uint8 zz2;
                 uint32 vadr;
 
                 if((tochange<=0 && MMC5HackSPMode&0x40) ||
@@ -606,7 +608,7 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 {
                  uint8 xs,ys;
 
-                 xs=33-X1; 
+                 xs=33-X1;
                  ys=((scanline>>3)+MMC5HackSPScroll)&0x1F;
                  if(ys>=0x1E) ys-=0x1E;
                  vadr=(MMC5HackExNTARAMPtr[xs|(ys<<5)]<<4)+(vofs&7);
@@ -640,15 +642,15 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
          {
           for(X1=33;X1;X1--,P+=8)
           {
-                uint8 *C;                                   
-                register uint8 cc;
-                register uint8 zz2;
-                uint32 vadr;  
+                uint8 *C;
+                uint8 cc;
+                uint8 zz2;
+                uint32 vadr;
 
                 C=MMC5HackVROMPTR;
                 zz2=(RefreshAddr>>10)&3;
                 vadr = (vnapage[zz2][RefreshAddr & 0x3ff] << 4) + vofs;
-                C += (((MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff]) & 0x3f & 
+                C += (((MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff]) & 0x3f &
                        MMC5HackVROMMask) << 12) + (vadr & 0xfff);
                 vadr = (MMC5HackExNTARAMPtr[RefreshAddr & 0x3ff] & 0xC0)>> 4;
                 cc = vadr;
@@ -665,7 +667,7 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
           for(X1=33;X1;X1--,P+=8)
           {
                 uint8 *C;
-                register uint8 cc,zz,zz2;
+                uint8 cc,zz,zz2;
                 uint32 vadr;
 
                 zz=RefreshAddr&0x1F;
@@ -676,22 +678,22 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                 cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2;
 
                #include "fceline.h"
-                
+
                if((RefreshAddr&0x1f)==0x1f)
                  RefreshAddr^=0x41F;
                 else
                  RefreshAddr++;
-          }          
+          }
          }
-        }       // End if(MMC5Hack) 
+        }       // End if(MMC5Hack)
 
         else if(PPU_hook)
         {
          for(X1=33;X1;X1--,P+=8)
          {
-                uint8 *C;                                   
-                register uint8 cc,zz,zz2;
-                uint32 vadr;  
+                uint8 *C;
+                uint8 cc,zz,zz2;
+                uint32 vadr;
 
                 zz=RefreshAddr&0x1F;
                 zz2=(RefreshAddr>>10)&3;
@@ -712,11 +714,11 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
          }
         }
         else
-        {      
+        {
          for(X1=33;X1;X1--,P+=8)
          {
                 uint8 *C;
-                register uint8 cc,zz,zz2;
+                uint8 cc,zz,zz2;
                 uint32 vadr;
 
                 zz=RefreshAddr&0x1F;
@@ -726,7 +728,7 @@ static void FASTAPASS(1) RefreshLine(uint8 *target)
                cc=vnapage[zz2][0x3c0+(zz>>2)+((RefreshAddr&0x380)>>4)];
                cc=((cc >> ((zz&2) + ((RefreshAddr&0x40)>>4))) &3) <<2;
                #include "fceline.h"
-                
+
                 if((RefreshAddr&0x1f)==0x1f)
                  RefreshAddr^=0x41F;
                 else
@@ -805,379 +807,25 @@ static void DoHBlank(void)
  //fprintf(stderr,"%3d: $%04x\n",scanline,RefreshAddr);
 }
 
-#define        V_FLIP  0x80
-#define        H_FLIP  0x40
-#define        SP_BACK 0x20
 
-typedef struct {
-        uint8 y,no,atr,x;
-} SPR;
 
-typedef struct {
-       uint8 ca[2],atr,x;
-} SPRB;
 
-uint8 sprlinebuf[256+8];        
 
-void FCEUI_DisableSpriteLimitation(int a)
-{
- maxsprites=a?64:8;
-}
 
-static uint8 nosprites,SpriteBlurp;
 
-static void FetchSpriteData(void)
-{
-       SPR *spr;
-       uint8 H;
-       int n,vofs;
 
-       spr=(SPR *)SPRAM;
-       H=8;
 
-       nosprites=SpriteBlurp=0;
 
-        vofs=(unsigned int)(PPU[0]&0x8&(((PPU[0]&0x20)^0x20)>>2))<<9;
-       H+=(PPU[0]&0x20)>>2;
 
-        if(!PPU_hook)
-         for(n=63;n>=0;n--,spr++)
-         {
-                if((unsigned int)(scanline-spr->y)>=H) continue;
 
-                if(nosprites<maxsprites)
-                {
-                 if(n==63) SpriteBlurp=1;
-
-                {
-                 SPRB dst;
-                 uint8 *C;
-                  int t;
-                  unsigned int vadr;
-
-                  t = (int)scanline-(spr->y);
-
-                  if (Sprite16)
-                   vadr = ((spr->no&1)<<12) + ((spr->no&0xFE)<<4);
-                  else
-                   vadr = (spr->no<<4)+vofs;
-
-                  if (spr->atr&V_FLIP)
-                  {
-                        vadr+=7;
-                        vadr-=t;
-                        vadr+=(PPU[0]&0x20)>>1;
-                        vadr-=t&8;
-                  }
-                  else
-                  {
-                        vadr+=t;
-                        vadr+=t&8;
-                  }
-
-                 /* Fix this geniestage hack */
-                 if(MMC5Hack && geniestage!=1) C = MMC5SPRVRAMADR(vadr);
-                  else C = VRAMADR(vadr);
-
-                 
-                 dst.ca[0]=C[0];
-                 dst.ca[1]=C[8];
-                 dst.x=spr->x;
-                 dst.atr=spr->atr;
-
-
-                 *(uint32 *)&SPRBUF[nosprites<<2]=*(uint32 *)&dst;
-                }
-
-                 nosprites++;
-                }
-                else
-                {
-                  PPU_status|=0x20;
-                  break;
-                }
-         }
-       else
-         for(n=63;n>=0;n--,spr++)
-         {
-                if((unsigned int)(scanline-spr->y)>=H) continue;
 
-                if(nosprites<maxsprites)
-                {
-                 if(n==63) SpriteBlurp=1;
-
-                 {
-                  SPRB dst;
-                  uint8 *C;
-                  int t;
-                  unsigned int vadr;
-
-                  t = (int)scanline-(spr->y);
-
-                  if (Sprite16)
-                   vadr = ((spr->no&1)<<12) + ((spr->no&0xFE)<<4);
-                  else
-                   vadr = (spr->no<<4)+vofs;
-
-                  if (spr->atr&V_FLIP)
-                  {
-                        vadr+=7;
-                        vadr-=t;
-                        vadr+=(PPU[0]&0x20)>>1;
-                        vadr-=t&8;
-                  }
-                  else
-                  {
-                        vadr+=t;
-                        vadr+=t&8;
-                  }
-
-                  if(MMC5Hack) C = MMC5SPRVRAMADR(vadr);
-                  else C = VRAMADR(vadr);
-                  dst.ca[0]=C[0];
-                 PPU_hook(vadr);
-                  dst.ca[1]=C[8];
-                 PPU_hook(vadr|8);
-                  dst.x=spr->x;
-                  dst.atr=spr->atr;
-
-
-                  *(uint32 *)&SPRBUF[nosprites<<2]=*(uint32 *)&dst;
-                 }
-
-                 nosprites++;
-                }
-                else
-                {
-                  PPU_status|=0x20;
-                  break;
-                }
-         }
-}
 
-static void FASTAPASS(1) RefreshSprite(uint8 *target)
-{
-       int n;
-        SPRB *spr;
-        uint8 *P=target;
-
-        if(!nosprites) return;
-       #ifdef FRAMESKIP
-       if(FSkip)
-       {
-        if(!SpriteBlurp)
-        {
-         nosprites=0;
-         return;
-        }
-        else
-         nosprites=1;
-       }
-       #endif
 
-        FCEU_dwmemset(sprlinebuf,0x80808080,256);
-        nosprites--;
-        spr = (SPRB*)SPRBUF+nosprites;
-
-       for(n=nosprites;n>=0;n--,spr--)
-       {
-        register uint8 J,atr,c1,c2;
-       int x=spr->x;
-        uint8 *C;
-        uint8 *VB;
-                
-        P+=x;
-
-        c1=((spr->ca[0]>>1)&0x55)|(spr->ca[1]&0xAA);
-       c2=(spr->ca[0]&0x55)|((spr->ca[1]<<1)&0xAA);
-
-        J=spr->ca[0]|spr->ca[1];
-       atr=spr->atr;
-
-                       if(J)
-                       {        
-                        if(n==0 && SpriteBlurp && !(PPU_status&0x40))
-                        {  
-                        int z,ze=x+8;
-                        if(ze>256) {ze=256;}
-                        if(ScreenON && (scanline<FSettings.FirstSLine || scanline>FSettings.LastSLine
-                        #ifdef FRAMESKIP
-                        || FSkip
-                        #endif
-                        ))
-                         BGRender(target);
-
-                        if(!(atr&H_FLIP))
-                        {
-                         for(z=x;z<ze;z++)
-                         {
-                          if(J&(0x80>>(z-x)))
-                          {
-                           if(!(target[z]&64))
-                            tosprite=z;
-                          }
-                         }
-                        }
-                        else
-                        {
-                          for(z=x;z<ze;z++)
-                          {
-                           if(J&(1<<(z-x)))
-                           {
-                            if(!(target[z]&64))
-                             tosprite=z;
-                           }
-                          }
-                        }
-                        //FCEU_DispMessage("%d, %d:%d",scanline,x,tosprite);
-                        }
 
-        C = sprlinebuf+x;
-         VB = (PALRAM+0x10)+((atr&3)<<2);
 
-         if(atr&SP_BACK) 
-         {
-          if (atr&H_FLIP)
-          {
-           if (J&0x02)  C[1]=VB[c1&3]|0x40;
-           if (J&0x01)  *C=VB[c2&3]|0x40;
-           c1>>=2;c2>>=2;
-           if (J&0x08)  C[3]=VB[c1&3]|0x40;;
-           if (J&0x04)  C[2]=VB[c2&3]|0x40;;
-           c1>>=2;c2>>=2;
-           if (J&0x20)  C[5]=VB[c1&3]|0x40;;
-           if (J&0x10)  C[4]=VB[c2&3]|0x40;;
-           c1>>=2;c2>>=2;
-           if (J&0x80)  C[7]=VB[c1]|0x40;;
-           if (J&0x40)  C[6]=VB[c2]|0x40;;
-         } else  {
-           if (J&0x02)  C[6]=VB[c1&3]|0x40;
-           if (J&0x01)  C[7]=VB[c2&3]|0x40;
-          c1>>=2;c2>>=2;
-           if (J&0x08)  C[4]=VB[c1&3]|0x40;
-           if (J&0x04)  C[5]=VB[c2&3]|0x40;
-           c1>>=2;c2>>=2;
-           if (J&0x20)  C[2]=VB[c1&3]|0x40;
-           if (J&0x10)  C[3]=VB[c2&3]|0x40;
-           c1>>=2;c2>>=2;
-           if (J&0x80)  *C=VB[c1]|0x40;
-           if (J&0x40)  C[1]=VB[c2]|0x40;
-         }
-         } else {
-          if (atr&H_FLIP)
-         {
-           if (J&0x02)  C[1]=VB[(c1&3)];
-           if (J&0x01)  *C=VB[(c2&3)];
-           c1>>=2;c2>>=2;
-           if (J&0x08)  C[3]=VB[(c1&3)];
-           if (J&0x04)  C[2]=VB[(c2&3)];
-           c1>>=2;c2>>=2;
-           if (J&0x20)  C[5]=VB[(c1&3)];
-           if (J&0x10)  C[4]=VB[(c2&3)];
-           c1>>=2;c2>>=2;
-           if (J&0x80)  C[7]=VB[c1];
-           if (J&0x40)  C[6]=VB[c2];
-          }else{                 
-           if (J&0x02)  C[6]=VB[(c1&3)];
-           if (J&0x01)  C[7]=VB[(c2&3)];
-           c1>>=2;c2>>=2;
-           if (J&0x08)  C[4]=VB[(c1&3)];
-           if (J&0x04)  C[5]=VB[(c2&3)];
-           c1>>=2;c2>>=2;
-           if (J&0x20)  C[2]=VB[(c1&3)];
-           if (J&0x10)  C[3]=VB[(c2&3)];
-           c1>>=2;c2>>=2;
-           if (J&0x80)  *C=VB[c1];
-           if (J&0x40)  C[1]=VB[c2];
-          }
-         }
-        }
-       P-=x;
-      }
-
-     nosprites=0;
-     #ifdef FRAMESKIP
-     if(FSkip) return;
-     #endif
-
-     {
-      uint8 n=((PPU[1]&4)^4)<<1;
-      loopskie:
-      {
-       uint32 t=*(uint32 *)(sprlinebuf+n);
-       if(t!=0x80808080)
-       {
-       #ifdef LSB_FIRST
-        if(!(t&0x80))
-        {
-         if(!(t&0x40))       // Normal sprite
-          P[n]=sprlinebuf[n];
-         else if(P[n]&64)        // behind bg sprite
-          P[n]=sprlinebuf[n];
-        }
-
-        if(!(t&0x8000))
-        {
-         if(!(t&0x4000))       // Normal sprite
-          P[n+1]=(sprlinebuf+1)[n];
-         else if(P[n+1]&64)        // behind bg sprite
-          P[n+1]=(sprlinebuf+1)[n];
-        }
-
-        if(!(t&0x800000))
-        {
-         if(!(t&0x400000))       // Normal sprite
-          P[n+2]=(sprlinebuf+2)[n];
-         else if(P[n+2]&64)        // behind bg sprite
-          P[n+2]=(sprlinebuf+2)[n];
-        }
-
-        if(!(t&0x80000000))
-        {
-         if(!(t&0x40000000))       // Normal sprite
-          P[n+3]=(sprlinebuf+3)[n];
-         else if(P[n+3]&64)        // behind bg sprite
-          P[n+3]=(sprlinebuf+3)[n];
-        }
-       #else
-        if(!(t&0x80000000))
-        {
-         if(!(t&0x40))       // Normal sprite
-          P[n]=sprlinebuf[n];
-         else if(P[n]&64)        // behind bg sprite
-          P[n]=sprlinebuf[n];
-        }
-
-        if(!(t&0x800000))
-        {
-         if(!(t&0x4000))       // Normal sprite
-          P[n+1]=(sprlinebuf+1)[n];
-         else if(P[n+1]&64)        // behind bg sprite
-          P[n+1]=(sprlinebuf+1)[n];
-        }
-
-        if(!(t&0x8000))
-        {
-         if(!(t&0x400000))       // Normal sprite
-          P[n+2]=(sprlinebuf+2)[n];
-         else if(P[n+2]&64)        // behind bg sprite
-          P[n+2]=(sprlinebuf+2)[n];
-        }
-
-        if(!(t&0x80))
-        {
-         if(!(t&0x40000000))       // Normal sprite
-          P[n+3]=(sprlinebuf+3)[n];
-         else if(P[n+3]&64)        // behind bg sprite
-          P[n+3]=(sprlinebuf+3)[n];
-        }
-       #endif
-       }
-      }
-      n+=4;
-      if(n) goto loopskie;
-     }
-}
+// ============================//
+// end of new code
+// ===========================//
 
 void ResetMapping(void)
 {
@@ -1226,7 +874,7 @@ void CloseGame(void)
    FlushGameCheats();
   #ifdef NETWORK
   if(FSettings.NetworkPlay) KillNetplay();
-  #endif       
+  #endif
   GameInterface(GI_CLOSE);
   CloseGenie();
   GameLoaded=0;
@@ -1286,7 +934,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
 
         endlseq:
         FCEU_fclose(fp);
-        GameLoaded=1;        
+        GameLoaded=1;
 
         FCEU_ResetVidSys();
         if(FCEUGameInfo.type!=GIT_NSF)
@@ -1303,7 +951,7 @@ FCEUGI *FCEUI_LoadGame(char *name)
          LoadGamePalette();
          LoadGameCheats();
         }
-        
+
        FCEU_ResetPalette();
         Exit=0;
         return(&FCEUGameInfo);
@@ -1335,6 +983,7 @@ void FCEU_ResetVidSys(void)
   FSettings.FirstSLine=FSettings.UsrFirstSLine[0];
   FSettings.LastSLine=FSettings.UsrLastSLine[0];
  }
+ printf("PAL = %i\n", PAL);
  SetSoundVariables();
 }
 
@@ -1346,7 +995,7 @@ int FCEUI_Initialize(void)
        FSettings.UsrFirstSLine[0]=8;
        FSettings.UsrFirstSLine[1]=0;
         FSettings.UsrLastSLine[0]=FSettings.UsrLastSLine[1]=239;
-       FSettings.SoundVolume=65536;    // 100%
+       FSettings.SoundVolume=65535;    // 100%
         return 1;
 }
 
@@ -1356,7 +1005,7 @@ static INLINE void Thingo(void)
    Loop6502();
 
    if(tosprite>=256)
-   { 
+   {
     X6502_Run(256-harko);
     Fixit1();
     X6502_Run(harko);
@@ -1399,14 +1048,14 @@ void EmLoop(void)
                                  breaks a Super Donkey Kong game. */
 
   X6502_Run(12);               /* I need to figure out the true nature and length
-                                  of this delay. 
+                                  of this delay.
                                */
   if(FCEUGameInfo.type==GIT_NSF)
    TriggerNMINSF();
   else if(VBlankON)
    TriggerNMI();
 
-  X6502_Run((scanlines_per_frame-242)*(256+85)-12); 
+  X6502_Run((scanlines_per_frame-242)*(256+85)-12);
 
   PPU_status&=0x1f;
 
@@ -1462,13 +1111,13 @@ void EmLoop(void)
    {
     FCEU_PutImageDummy();
     FSkip--;
-    FCEUD_Update(0,WaveFinal,ssize);
+    FCEUD_Update(0,WaveFinalMono,ssize);
    }
    else
    #endif
    {
     FCEU_PutImage();
-    FCEUD_Update(XBuf+8,WaveFinal,ssize);
+    FCEUD_Update(XBuf+8,WaveFinalMono,ssize);
    }
    UpdateInput();
   }
@@ -1545,7 +1194,7 @@ void ResetNES(void)
         X6502_Reset();
 }
 
-void PowerNES(void) 
+void PowerNES(void)
 {
         if(!GameLoaded) return;