@tmustier/pi-nes 0.2.15 → 0.2.17

package/extensions/nes/native/nes-core/vendor/nes_rust/src/mapper.rs

@@ -118,7 +118,16 @@ impl Mapper for MMC1Mapper {
 	fn map(&self, address: u32) -> u32 {
 		let bank: u32;
 		let mut offset = address & 0x3FFF;
-		let bank_num = self.prg_bank_register.load() as u32 & 0x1F;
+		let prg_low = (self.prg_bank_register.load() as u32) & 0x0F;
+		let prg_high = if self.program_bank_num > 16 {
+			((self.chr_bank0_register.load() as u32) & 0x10) >> 4
+		} else {
+			0
+		};
+		let mut bank_num = (prg_high << 4) | prg_low;
+		if self.program_bank_num > 0 {
+			bank_num %= self.program_bank_num as u32;
+		}
 
 		match self.control_register.load_bits(2, 2) {
 			0 | 1 => {
@@ -167,23 +176,23 @@ impl Mapper for MMC1Mapper {
 			self.register_write_count = 0;
 			self.latch.clear();
 			if (address & 0x6000) == 0 {
-				self.control_register.store_bits(2, 2, 3);
-			}
-		} else {
-			self.latch.store(((value & 1) << 4) | (self.latch.load() >> 1));
-			self.register_write_count += 1;
-
-			if self.register_write_count >= 5 {
-				let val = self.latch.load();
-				match address & 0x6000 {
-					0x0000 => self.control_register.store(val),
-					0x2000 => self.chr_bank0_register.store(val),
-					0x4000 => self.chr_bank1_register.store(val),
-					_ /*0x6000*/ => self.prg_bank_register.store(val)
-				};
-				self.register_write_count = 0;
-				self.latch.clear();
+				self.control_register.store(0x0C);
 			}
+			return;
+		}
+		self.latch.store(((value & 1) << 4) | (self.latch.load() >> 1));
+		self.register_write_count += 1;
+
+		if self.register_write_count >= 5 {
+			let val = self.latch.load();
+			match address & 0x6000 {
+				0x0000 => self.control_register.store(val),
+				0x2000 => self.chr_bank0_register.store(val),
+				0x4000 => self.chr_bank1_register.store(val),
+				_ /*0x6000*/ => self.prg_bank_register.store(val)
+			};
+			self.register_write_count = 0;
+			self.latch.clear();
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-nes",
-  "version": "0.2.15",
+  "version": "0.2.17",
   "description": "NES emulator extension for pi",
   "keywords": [
     "pi-package",