@tmustier/pi-nes 0.2.16 → 0.2.18

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

@@ -118,34 +118,39 @@ impl Mapper for MMC1Mapper {
 	fn map(&self, address: u32) -> u32 {
 		let bank: u32;
 		let mut offset = address & 0x3FFF;
-		let bank_mask = if self.program_bank_num > 16 { 0x1F } else { 0x0F };
-		let mut bank_num = self.prg_bank_register.load() as u32 & bank_mask;
-		if self.program_bank_num > 0 {
-			bank_num %= self.program_bank_num as u32;
-		}
+		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 outer_offset = prg_high * 0x10;
+		let bank_num = prg_low;
 
 		match self.control_register.load_bits(2, 2) {
 			0 | 1 => {
 				// switch 32KB at 0x8000, ignoring low bit of bank number
 				// TODO: Fix me
 				offset = offset | (address & 0x4000);
-				bank = bank_num & 0x1E;
+				bank = outer_offset + (bank_num & 0x1E);
 			},
 			2 => {
 				// fix first bank at 0x8000 and switch 16KB bank at 0xC000
 				bank = match address < 0xC000 {
-					true => 0,
-					false => bank_num
+					true => outer_offset,
+					false => outer_offset + bank_num
 				};
 			},
 			_ /*3*/ => {
 				// fix last bank at 0xC000 and switch 16KB bank at 0x8000
 				bank = match address >= 0xC000 {
-					true => self.program_bank_num as u32 - 1,
-					false => bank_num
+					true => outer_offset + 0x0F,
+					false => outer_offset + bank_num
 				};
 			}
 		};
+		let max_bank = self.program_bank_num as u32;
+		let bank = if max_bank > 0 { bank % max_bank } else { bank };
 		bank * 0x4000 + offset
 	}
 

package/package.json

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