FranLMSP/rmg-001
1
0
Fork 0
mirror of https://github.com/FranLMSP/rmg-001.git synced 2024-11-23 10:12:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix sprites bug

Browse Source
This commit is contained in:
Franco Colmenarez 2021-11-19 10:19:01 -05:00
parent 22c09895d7
commit 841cc96a67
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ppu.rs
View File

@ -156,8 +156,8 @@ impl Sprite {
true => 16, true => 16,
false => 8, false => 8,
}; };
let x = lcd_x.saturating_sub(self.x.saturating_sub(8)); let x = (lcd_x + 8) - self.x;
let y = lcd_y.saturating_sub(self.y .saturating_sub(16)); let y = (lcd_y + 16) - self.y;
let x = match self.x_flip { let x = match self.x_flip {
true => 7 - x, true => 7 - x,
false => x, false => x,
@ -430,16 +430,28 @@ impl PPU {
let y = self.read_oam(addr); let y = self.read_oam(addr);
let x = self.read_oam(addr + 1); let x = self.read_oam(addr + 1);
if x == 0 {
addr += 4;
continue;
}
let sprite_height: u8 = match long_sprites { let sprite_height: u8 = match long_sprites {
true => 16, true => 16,
false => 8, false => 8,
}; };
if x == 0 {
addr += 4;
continue;
} else if x >= 160 + 8 {
addr += 4;
continue;
} else if y == 0 {
addr += 4;
continue;
} else if y >= 144 + 16 {
addr += 4;
continue;
} else if !long_sprites && y <= 8 {
addr += 4;
continue;
}
let lcd_y = self.lcd_y.saturating_add(16); let lcd_y = self.lcd_y.saturating_add(16);
if lcd_y < y || lcd_y > (y + sprite_height - 1) { if lcd_y < y || lcd_y > (y + sprite_height - 1) {