@tmustier/pi-nes 0.2.13 → 0.2.15

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

@@ -118,14 +118,14 @@ 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 & 0x0F;
+		let bank_num = self.prg_bank_register.load() as u32 & 0x1F;
 
 		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 & 0x0E;
+				bank = bank_num & 0x1E;
 			},
 			2 => {
 				// fix first bank at 0x8000 and switch 16KB bank at 0xC000

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

@@ -438,22 +438,22 @@ impl Ppu {
 		// 0x0000 - 0x1FFF is mapped with cartridge's CHR-ROM if exists.
 		// Otherwise load from VRAM.
 
-		match address < 0x2000 && rom.has_chr_rom() {
-			true => rom.load(address as u32),
-			false => self.vram.load(self.convert_vram_address(address, rom) as u32)
+		if address < 0x2000 {
+			return rom.load_chr(address as u32);
 		}
+		self.vram.load(self.convert_vram_address(address, rom) as u32)
 	}
 
 	fn store(&mut self, mut address: u16, value: u8, rom: &mut Rom) {
 		address = address & 0x3FFF;  // just in case
 
-		// 0x0000 - 0x1FFF is mapped with cartridge's CHR-ROM if exists.
-		// Otherwise store to VRAM.
+		// 0x0000 - 0x1FFF is mapped with cartridge CHR (ROM or RAM).
 
-		match address < 0x2000 && rom.has_chr_rom() {
-			true => rom.store(address as u32, value),
-			false => self.vram.store(self.convert_vram_address(address, rom) as u32, value)
-		};
+		if address < 0x2000 {
+			rom.store_chr(address as u32, value);
+			return;
+		}
+		self.vram.store(self.convert_vram_address(address, rom) as u32, value);
 	}
 
 	fn convert_vram_address(&self, address: u16, rom: &Rom) -> u16 {
@@ -1365,14 +1365,18 @@ impl Sprite {
 	}
 
 	fn on(&self, y: u8, height: u8) -> bool {
-		(y >= self.get_y()) && (y < self.get_y() + height)
+		let sprite_y = self.get_y() as u16 + 1;
+		let y = y as u16;
+		y >= sprite_y && y < sprite_y + height as u16
 	}
 
 	fn get_y_in_sprite(&self, y: u8, height: u8) -> u8 {
 		// Assumes self.on(y, height) is true
+		let sprite_y = self.get_y() as u16 + 1;
+		let delta = (y as u16 - sprite_y) as u8;
 		match self.vertical_flip() {
-			true => height - 1 - (y - self.get_y()),
-			false => y - self.get_y()
+			true => height - 1 - delta,
+			false => delta
 		}
 	}
 }

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

@@ -4,6 +4,7 @@ use mapper::{Mapper, MapperFactory};
 pub struct Rom {
 	header: RomHeader,
 	memory: Memory,
+	chr_ram: Option<Memory>,
 	mapper: Box<dyn Mapper>
 }
 
@@ -20,9 +21,20 @@ impl Rom {
 	pub fn new(data: Vec<u8>) -> Self {
 		let header = RomHeader::new(data[0..HEADER_SIZE].to_vec());
 		let mapper = MapperFactory::create(&header);
+		let data_start = HEADER_SIZE + if header.has_trainer() { 512 } else { 0 };
+		let rom_data = if data.len() > data_start {
+			data[data_start..].to_vec()
+		} else {
+			Vec::new()
+		};
+		let chr_ram = match header.chr_ram_size_bytes() {
+			0 => None,
+			size => Some(Memory::new(vec![0; size])),
+		};
 		Rom {
 			header: header,
-			memory: Memory::new(data[HEADER_SIZE..].to_vec()),
+			memory: Memory::new(rom_data),
+			chr_ram,
 			mapper: mapper
 		}
 	}
@@ -37,21 +49,63 @@ impl Rom {
 	 * In general writing control registers in Mapper via .store() switches bank.
 	 */
 	pub fn load(&self, address: u32) -> u8 {
-		let mut address_in_rom = 0 as u32;
 		if address < 0x2000 {
-			// load from character rom
-			address_in_rom += self.header.prg_rom_bank_num() as u32 * 0x4000;
-			address_in_rom += self.mapper.map_for_chr_rom(address);
-		} else {
-			address_in_rom += self.mapper.map(address);
+			return self.load_chr(address);
+		}
+		self.memory.load(self.mapper.map(address))
+	}
+
+	pub fn load_chr(&self, address: u32) -> u8 {
+		let mapped = self.map_chr_address(address);
+		if let Some(chr_ram) = &self.chr_ram {
+			return chr_ram.load(mapped);
+		}
+		let offset = self.prg_rom_size() + mapped;
+		self.memory.load(offset)
+	}
+
+	pub fn store_chr(&mut self, address: u32, value: u8) {
+		let size = match self.chr_ram.as_ref() {
+			Some(ram) => ram.capacity(),
+			None => return,
+		};
+		if size == 0 {
+			return;
+		}
+		let mapped = self.mapper.map_for_chr_rom(address) % size;
+		if let Some(chr_ram) = self.chr_ram.as_mut() {
+			chr_ram.store(mapped, value);
 		}
-		self.memory.load(address_in_rom)
 	}
 
 	pub fn load_without_mapping(&self, address: u32) -> u8 {
 		self.memory.load(address)
 	}
 
+	fn prg_rom_size(&self) -> u32 {
+		self.header.prg_rom_bank_num() as u32 * 0x4000
+	}
+
+	fn chr_rom_size(&self) -> u32 {
+		self.header.chr_rom_bank_num() as u32 * 0x2000
+	}
+
+	fn chr_ram_size(&self) -> u32 {
+		self.chr_ram.as_ref().map_or(0, |ram| ram.capacity())
+	}
+
+	fn map_chr_address(&self, address: u32) -> u32 {
+		let size = if self.chr_ram.is_some() {
+			self.chr_ram_size()
+		} else {
+			self.chr_rom_size()
+		};
+		if size == 0 {
+			return 0;
+		}
+		self.mapper.map_for_chr_rom(address) % size
+	}
+
 	/**
 	 * In general writing with ROM address space updates control registers in Mapper.
 	 */
@@ -135,6 +189,13 @@ impl RomHeader {
 		self.chr_rom_bank_num() > 0
 	}
 
+	fn chr_ram_size_bytes(&self) -> usize {
+		if self.has_chr_rom() {
+			return 0;
+		}
+		0x2000
+	}
+
 	fn control_byte1(&self) -> u8 {
 		self.load(6)
 	}
@@ -180,8 +241,8 @@ impl RomHeader {
 		self.extract_bits(self.control_byte1(), 1, 1) == 1
 	}
 
-	fn _trainer_512_bytes(&self) -> u8 {
-		self.extract_bits(self.control_byte1(), 2, 1)
+	pub fn has_trainer(&self) -> bool {
+		self.extract_bits(self.control_byte1(), 2, 1) == 1
 	}
 
 	fn four_screen_mirroring(&self) -> bool {

package/package.json

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