Made some sprite fixes

Author: torch2424

core/graphics/pixelPipeline/pixelFetcher.ts

@@ -267,10 +267,6 @@ function _storeFetchIntoFifo(): void {
       return;
     }
 
-    // Debug: Are we writing sprites?
-    // Yes we are, and what seems like correct scanlines
-    // log(0x99, Graphics.scanlineRegister);
-
     // Get our data and type per pixel
     let fifoTileDataByteZero = loadPixelFifoByteForPixelIndexFromWasmBoyMemory(0, PixelFifo.currentIndex);
     let fifoTileDataByteOne = loadPixelFifoByteForPixelIndexFromWasmBoyMemory(1, PixelFifo.currentIndex);
@@ -288,7 +284,7 @@ function _storeFetchIntoFifo(): void {
 
       // Palette ColorId zero (last two bits of pallette) of a sprite are always transparent
       // http://gbdev.gg8.se/wiki/articles/Video_Display
-      if (spritePaletteColorId !== 0) {
+      if (spritePaletteColorId === 0) {
         continue;
       }
 
@@ -329,6 +325,13 @@ function _storeFetchIntoFifo(): void {
         // Debug / TODO : Firgure our why sprites aren't shoing up...
         // fifoTypePerPixel is correct, maybe is is the data bytes?
         // log(0x87, fifoTypePerPixel);
+        // log(0x89, spritePaletteColorId);
+        // log(0x90, fifoTileDataByteZero);
+        // log(0x91, fifoTileDataByteOne);
+
+        // Debug: Are we writing sprites?
+        // Yes we are, and what seems like correct scanlines
+        // log(0x99, Graphics.scanlineRegister);
 
         // Write back to the fifo
         storePixelFifoByteForPixelIndexIntoWasmBoyMemory(0, PixelFifo.currentIndex, fifoTileDataByteZero);

core/graphics/pixelPipeline/pixelFifo.ts

@@ -11,6 +11,7 @@ export class PixelFifo {
   // Status of the Fetcher
   // 0: Idling
   // 1: Pushing Pixels
+  // 2: Idling because fetching sprite
   static currentStatus: i32 = 0;
 
   // Number of pixels in our fifo
@@ -25,7 +26,20 @@ export class PixelFifo {
     PixelFifo.numberOfPixelsInFifo = 0;
   }
 
+  static startSpriteIdle(): void {
+    PixelFifo.currentStatus = 2;
+  }
+
+  static stopSpriteIdle(): void {
+    PixelFifo.currentStatus = 0;
+  }
+
   static step(): void {
+    // Check if we are waiting for a sprite fetch
+    if (PixelFifo.currentStatus === 2) {
+      return;
+    }
+
     // Check if we can continue idling
     // Pixel Fifo won't push out pixels if there is <= 8 pixels in the fifo
     let pixelsRemainingInFifo = PixelFifo.numberOfPixelsInFifo - PixelFifo.currentIndex;

core/graphics/pixelPipeline/pixelPipeline.ts

@@ -39,6 +39,10 @@ export class PixelPipeline {
     cpuCycles = cpuCycles >> (<i32>Cpu.GBCDoubleSpeed);
 
     for (let pixelPipelineCyclesStepped: i32 = 0; pixelPipelineCyclesStepped < cpuCycles; pixelPipelineCyclesStepped++) {
+      // Debug:
+      // The problem with sprites is that we are still pushing pixels, while we are trying to fetch sprites.
+      // We need to do checks, and then proceed down a certain path
+
       // Push our a pixel
       PixelFifo.step();
 
@@ -47,17 +51,25 @@ export class PixelPipeline {
       /*
       if (_tryToFetchSprite()) {
         // We are fetching a sprite!
-      } else if (_tryToFetchWindow()) {
-        // We are fetching window!
+        PixelFifo.startSpriteIdle();
       } else {
-        _tryToFetchBackground();
+
+        PixelFifo.stopSpriteIdle();
+
+        if (_tryToFetchWindow()) {
+          // We are fetching window!
+        } else {
+          _tryToFetchBackground();
+        }
       }
        */
 
       // DEBUG: Just do sprites and BG
       if (_tryToFetchSprite()) {
         // We are fetching a sprite!
+        PixelFifo.startSpriteIdle();
       } else {
+        PixelFifo.stopSpriteIdle();
         _tryToFetchBackground();
       }
 
@@ -121,13 +133,28 @@ function _tryToFetchSprite(): boolean {
     // NOTE: Y Position was handled by the OAM Search,
     // and sprites are not affected by scroll Y
     // So we know the sprite is on this scanline
-    if (PixelFifo.currentIndex >= spriteXPosition && PixelFifo.currentIndex < spriteXPosition + 8) {
+    // Also, we only want to check for the start of the sprite, not it's entire width
+    // since the entire 8 x pixels of the tile are fetched at once
+    if (PixelFifo.currentIndex === spriteXPosition) {
       // We need to fetch this sprite!
 
+      // Debug: also need to fix tile line in the fetcher!!!
+      // getting off train
+
+      // Get which line of the 8x8 or 8x16 tile.
+      // Need to sub tract 16 from the total because of the tile height, to get the line
+      // Debug, may need to put the sprite height here in stead of 16.
+      let spriteTileLine = Graphics.scanlineRegister - spriteYPosition - 16;
+
       // Check if we are already fetching the sprite,
       // If not, start fetching it
-      let spriteTileLine = Graphics.scanlineRegister - spriteYPosition;
       if (!PixelFetcher.isFetchingSpriteTileLine(spriteTileLine, spriteIndex)) {
+        // Debug: We are fetching this sprite
+        // But which line and things?
+        let spriteHeight: i32 = Lcd.tallSpriteSize ? 16 : 8;
+        log(Graphics.scanlineRegister, spriteYPosition);
+        log(0x01, spriteHeight);
+
         // Just reset everything, and start fetching the sprite
         PixelFetcher.startSpriteFetch(spriteTileLine, spriteIndex);
       }

core/graphics/sprites.ts

@@ -46,6 +46,8 @@ export class Sprites {
       // Y is offset by 16. An off-screen value (for example, Y=0 or Y>=160) hides the sprite.
       spriteYPosition -= 16;
 
+      // DEBUG: Tile line is wrong, both here and the fetcher.
+
       // Find if the sprite is visible
       // spriteXPosition > -8 because:
       // X is minus 8 pixels, and since sprites can only be 8 pixels wide, it would be not visible.