paoda/gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: code cleanup

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2021-11-30 03:45:54 -04:00
parent a0e3c7c602
commit 70e0b5868d
6 changed files with 42 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ppu.rs
View File

@@ -265,7 +265,7 @@ impl Ppu {
TileLowB => {
let obj_size = self.ctrl.obj_size();
let addr = PixelFetcher::get_obj_addr(attr, &self.pos, obj_size);
let addr = PixelFetcher::obj_addr(attr, &self.pos, obj_size);
let byte = self.read_byte(addr);
self.fetch.obj.tile.with_low(byte);
@@ -276,7 +276,7 @@ impl Ppu {
TileHighB => {
let obj_size = self.ctrl.obj_size();
let addr = PixelFetcher::get_obj_addr(attr, &self.pos, obj_size);
let addr = PixelFetcher::obj_addr(attr, &self.pos, obj_size);
let byte = self.read_byte(addr + 1);
self.fetch.obj.tile.with_high(byte);
@@ -441,7 +441,7 @@ impl Ppu {
fn obj_pixel(&self, obj: ObjPixelProperty) -> GrayShade {
use ObjectPaletteKind::*;
assert!(obj.shade_id != 0);
assert_ne!(obj.shade_id, 0);
let p0 = &self.monochrome.obj_palette_0;
let p1 = &self.monochrome.obj_palette_1;
@@ -683,7 +683,7 @@ impl PixelFetcher {
Ok(())
}
fn get_obj_addr(attr: &ObjectAttr, pos: &ScreenPosition, size: ObjectSize) -> u16 {
fn obj_addr(attr: &ObjectAttr, pos: &ScreenPosition, size: ObjectSize) -> u16 {
let line_y = pos.line_y;
// TODO: Why is the offset 14 and 30 respectively?