@tmustier/pi-nes 0.2.13 → 0.2.14

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

@@ -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

@@ -20,9 +20,15 @@ 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()
+		};
 		Rom {
 			header: header,
-			memory: Memory::new(data[HEADER_SIZE..].to_vec()),
+			memory: Memory::new(rom_data),
 			mapper: mapper
 		}
 	}
@@ -180,8 +186,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.14",
   "description": "NES emulator extension for pi",
   "keywords": [
     "pi-package",