Forgot to push some changes lol

UxROM and AxROM, plus some bug fixes, plus some features

Author: mushrombrother

README.md

@@ -1,36 +1,38 @@
 <p align='center'><img src='https://github.com/nectarboy/nes/blob/main/src/img/pooptendo.png?raw=true'></p>
 <h1 align='center'>Pooptendo</h1>
 
-This is Pooptendo, a Nintendo Entertainment System but stuffed inside with horse manure.
+This is Pooptendo, a Nintendo Entertainment System but stuffed inside with horse manure (emulator).
 Games may or may not work when you plug them into this Pooptendo.
 
-Its a big WIP as you can prolly tell ... but some games work !<br>
+Pooptendo is mostly complete i think, most games i've tried work with few issues.<br>
 [you can try it online :)](https://nectarboy.github.io/nes)
 
-## what about it ?
-Pooptendo kinda aims for cycle accuracy; i want most well known (and the fun) games to work, and the final boss is that difficult-to-emulate froggy game >:D
+## Features
+Pooptendo aims for accuracy but also makes some sacrifices for speed; i want most well known (and the fun) games to work, and the final boss is the froggy game Battle-Toads >:D (it runs! but it is a bit broken)
 
-The CPU is cycle accurate, but there might be a few bugs lying around.<br>
-The PPU is emulated to the pixel level, though i sometimes make small sacrifices for speed, and there are still some missing stuff.<br>
+If your computer is new enough, most games should run at full speed, but stuttering does occur sometimes; if that happens, turn off frame-skip.
+
+The CPU is cycle accurate, but there might be a few timing bugs lying around.<br>
+The PPU is emulated to the pixel level, though i sometimes make small sacrifices for speed, and there are still some missing features.<br>
 If issues show up though, (or if i manage to make it fast enough), i'll do my best to make it as accurate as i can :)
 
-![super fuckin mario](https://github.com/nectarboy/nes/blob/main/docs/pics/Super_Mario_Bros/title.png?raw=true)
-![red panda <3](https://github.com/nectarboy/nes/blob/main/docs/pics/Homebrew/redpanda.png?raw=true)
-![donkey fuck](https://github.com/nectarboy/nes/blob/main/docs/pics/Mega_Man_2/title.png?raw=true)
+![super mario :)](https://github.com/nectarboy/nes/blob/main/docs/pics/Super_Mario_Bros/title.png?raw=true)
+![red panda :)](https://github.com/nectarboy/nes/blob/main/docs/pics/Homebrew/redpanda.png?raw=true)
+![mega man :)](https://github.com/nectarboy/nes/blob/main/docs/pics/Mega_Man_2/title.png?raw=true)
 
-![super fuckin mario](https://github.com/nectarboy/nes/blob/main/docs/pics/Tetris/stack.png?raw=true)
-![red panda <3](https://github.com/nectarboy/nes/blob/main/docs/pics/Kirbys_Adventure/crane.png?raw=true)
-![donkey fuck](https://github.com/nectarboy/nes/blob/main/docs/pics/River_City_Ransom/sushi.png?raw=true)
+![tetris](https://github.com/nectarboy/nes/blob/main/docs/pics/Tetris/stack.png?raw=true)
+![kirby :)](https://github.com/nectarboy/nes/blob/main/docs/pics/Kirbys_Adventure/crane.png?raw=true)
+![sushi](https://github.com/nectarboy/nes/blob/main/docs/pics/River_City_Ransom/sushi.png?raw=true)
 
 ---
 
-## functionality
+## Functionality
 ```
-POOPTENDO STATUS :: horse manure is beginning to clear out
+POOPTENDO STATUS :: horse manure is clearing out
 ```
 
-Pooptendo is being written in JS atm, however, i wanna remake it in C sometime !
-(i hope i dont give up on that TwT)
+Pooptendo is written in JS atm, however I had plans to remake it in C.
+(This probably won't happen, I might start a new emulator in a language like C++)
 
 ### how to use
 Click <kbd>Choose File</kbd>to insert a ROM.
@@ -55,10 +57,10 @@ These are the default keybinds, they cannot be changed atm soz lol :3
 
 ### compatibility
 ```
-- cpu           (%95)
+- cpu           (%95) 
 - ppu           (%90)
-- cartridge     (%20)
-- apu           (%25)
+- cartridge     (%25)
+- apu           (%80)
 - joypad        (%90)
 - extra stuff   (%0)
 - cool emu shit (%10)
@@ -67,7 +69,10 @@ These are the default keybinds, they cannot be changed atm soz lol :3
 Current mappers supported:
 - NROM
 - MMC1
+- MMC2
 - MMC3 (WIP)
+- UxROM
+- AxROM
 
 ### importing
 if you want to import Pooptendo to your site or something, first of all pls credit me :3, second of all:
@@ -76,7 +81,7 @@ import NES from './core/nes.js'; // Pooptendo is modular
 
 var nes = new NES();
 nes.attachCanvas(canvas);
-nes.loadRomBuff(romBuff); // A Uint8Array buffer
+nes.loadRomBuff(romBuff); // A Uint8Array buffer with the ROM data
 nes.start();
 ```
 By default, Pooptendo's default settings are:
@@ -89,6 +94,8 @@ Refer to `nes.js` in the core to figure out how to set it up to your liking :3
 ---
 
 ### goodbye
+having more experience after my Game Boy emulator, this emulator is a little more refined and the codebase is cleaner. i probably won't update it much anymore, but overall it was very fun :)
+
 thanks for checking out Pooptendo !
 
-nectarboy | 2021-2022
+nectarboy | 2021-2023

docs/pics/Castlevania/castle.png

@@ -44,6 +44,7 @@ <h1>
                         <input id='pitchshift' class='Range' type='range' max='30' min='-30' step='1' title='(NOTE: This alters actual APU timers)'>
 
                         <span id='frameskip' class='Button' title='(Turn this off if bad freezing or stuttering)'>Frameskip</span>
+                        <span id='antialias' class='Button' title='Toggle anti-aliasing'>Anti-Alias</span>
                         <span id='fullscreen' class='Button' title='Toggle fullscreen'>Fullscreen</span>
                     </div>
                     <span id='minimize' class='SmallButton'><</span>

index.html

@@ -32,6 +32,7 @@ function Apu(nes) {
         const buffNumber = 5;
         this.buffNumber = buffNumber;
 
+        this.buffStep = 0;
         this.buffLength = length;
         this.sampleRate = sampleRate;
         for (i = 0; i < buffNumber; i++) {

src/core/apu/apu.js

@@ -263,6 +263,47 @@ const Cartridge = function(nes, mem) {
         }
     };
 
+    // UxROM
+    this.mappers[2] = {
+        rombankaddr: new Array(2),
+
+        read(addr) {
+            if (addr < 0x8000) {
+                return 0; // (OPENBUS)
+            }
+            else {
+                return mem.rom[((addr & 0x3fff) + this.rombankaddr[(addr & 0x7fff) >> 14]) & mem.romSizeMask]; // rom
+            }
+            //      # # #     amogus
+            //          # #
+            //      # # # #
+            //      #   #
+        },
+        write(addr, val) {
+            if (addr < 0x8000) {
+                return 0; // (OPENBUS)
+            }
+            else {
+                this.rombankaddr[0] = val << 14;
+            }
+        },
+        readChr(addr) {
+            return mem.chr[addr & mem.chrSizeMask];
+        },
+        writeChr(addr, val) {
+            if (mem.hasChrRam) {
+                mem.chr[addr & mem.chrSizeMask] = val; // 16KB CHR RAM
+            }
+        },
+
+        feedAddr(addr) {},
+
+        reset() {
+            this.rombankaddr[0] = 0;
+            this.rombankaddr[1] = mem.romSize - 0x4000;
+        }
+    };
+
     // MMC3
     this.mappers[4] = {
         bankselected: 0,
@@ -538,7 +579,7 @@ const Cartridge = function(nes, mem) {
         }
     };
 
-    //this.mappers[4] = this.mappers[0]; // debug hehe
+    this.mappers[90] = this.mappers[4]; // JY Company mapper
 
     // AxROM
     this.mappers[7] = {

src/core/mem/cartridge.js

@@ -460,30 +460,36 @@ const Mem = function(nes) {
     this.cartramSizeMask = 0;
 
     // Loading cart
-    this.loadRomBuff = function(romBuff) {
-        if (typeof romBuff !== 'object') {
+    this.loadRomBuff = function(rombuff) {
+        if (typeof rombuff !== 'object') {
             throw 'This is not a ROM!';
             return;
         }
 
-        var rom = new Uint8Array(romBuff);
-        this.loadRomProps(rom);
+        rombuff = new Uint8Array(rombuff);
+        this.loadRomProps(rombuff);
     };
 
     this.loadSaveBuff = function(savebuff) {
+        if (typeof savebuff !== 'object') {
+            throw 'This is not a SAVE!';
+            return;
+        }
+
         if (!this.hasExtraRam) {
-            throw 'ROM doesn\'t have save files!';
+            throw 'This ROM doesn\'t have save files!';
             return false;
         }
 
         savebuff = new Uint8Array(savebuff);
         var length = Math.min(savebuff.length, this.cartram.length);
+
+        this.cartram.fill(0);
         for (var i = 0; i < length; i++) {
             this.cartram[i] = savebuff[i];
         }
 
-        console.log('Loaded save file', savebuff);
-
+        console.log('Loaded save file');
         return true;
     };
 

src/core/mem/mem.js

@@ -441,6 +441,7 @@ const Ppu = function(nes) {
 
     // Sprite rendering
     this.getSpritePixel = function(lx, px) {
+        var lyMul256 = this.ly << 8;
         for (var i = 0; i < this.spritesThisLine; i++) {
             const oami = i << 2;
 
@@ -457,15 +458,17 @@ const Ppu = function(nes) {
                 var bit = (((this.sData[sdatai+1] >> shift) & 1) << 1) | ((this.sData[sdatai] >> shift) & 1);
 
                 if (bit) {
+                    var bgBitOpaque = this.bgMap[lyMul256 + lx] !== 0;
+
                     // Sprite 0 check
                     if (!this.sprite0Atm && this.sNums[i] === 0) {
                         this.sprite0Atm = true;
                         this.sprite0Happened = true;
                     }
 
                     // Priority check
-                    if (this.sAttr[i].priority && this.bgMap[this.ly * 256 + lx])
-                        continue;
+                    if (this.sAttr[i].priority && bgBitOpaque)
+                        return px;
 
                     var palMemAddr = 0x3f10 | (this.sAttr[i].pallete << 2) | bit;
 

src/core/ppu/ppu.js

@@ -38,13 +38,13 @@ html, body {
 /* Settings */
 .FileButton, .Button, .SmallButton {
     font-family: arial;
-    font-size: 13px;
+    font-size: 12px;
 
     position: relative;
     display: inline-block;
 
-    height: 28px;
-    line-height: 28px;
+    height: 24px;
+    line-height: 24px;
     text-align: center;
 
     user-select: none;
@@ -62,16 +62,13 @@ html, body {
 
 .FileButton {
     display: ;
-    width: 100px;
-    height: 28px;
+    width: 90px;
 }
 .Button {
-    width: 80px;
-    height: 28px;
+    width: 70px;
 }
 .SmallButton {
-    width: 28px;
-    height: 28px;
+    width: 24px;
 }
 .Range {
     user-select: none;

src/css/index.css

@@ -11,6 +11,7 @@ const saveinput = document.getElementById('saveinput');
 const settingsdiv = document.getElementById('settingsdiv');
 const minimize = document.getElementById('minimize');
 const fullscreen = document.getElementById('fullscreen');
+const antialias = document.getElementById('antialias');
 const frameskip = document.getElementById('frameskip');
 const pitchshift = document.getElementById('pitchshift');
 const pitchshiftreset = document.getElementById('pitchshiftreset');
@@ -78,6 +79,19 @@ fullscreen.onclick = function() {
     }
 };
 
+// Anti-Alias
+var isantialias = false;
+antialias.onclick = function() {
+    if (isantialias) {
+        isantialias = false;
+        canvas.style.imageRendering = 'pixelated';
+    }
+    else {
+        isantialias = true;
+        canvas.style.imageRendering = 'auto';
+    }
+};
+
 // Frameskip
 var isframeskip = nes.frameskip;
 frameskip.onclick = function() {