diff --git a/examples/bg_demo.rs b/examples/bg_demo.rs index d15b0ce..472233c 100644 --- a/examples/bg_demo.rs +++ b/examples/bg_demo.rs @@ -36,9 +36,7 @@ fn main(_argc: isize, _argv: *const *const u8) -> isize { BG0CNT.write(BackgroundControlSetting::new().with_screen_base_block(8)); // Display Control DISPCNT.write(DisplayControlSetting::new().with_bg0(true)); - loop { - // TODO the whole thing - } + loop {} } pub const ALL_TWOS: Tile4bpp = Tile4bpp([ diff --git a/src/base/volatile.rs b/src/base/volatile.rs index 7f74f69..1ae8ae6 100644 --- a/src/base/volatile.rs +++ b/src/base/volatile.rs @@ -286,7 +286,7 @@ impl VolAddressBlock { if slot < self.slots { unsafe { self.vol_address.offset(slot as isize) } } else { - panic!("Index Requested: {} >= Bound: {}", slot, self.slots) + panic!("Index Requested: {} >= Slot Count: {}", slot, self.slots) } } diff --git a/src/io/keypad.rs b/src/io/keypad.rs index f4fab87..80e5d55 100644 --- a/src/io/keypad.rs +++ b/src/io/keypad.rs @@ -13,10 +13,12 @@ pub const KEYINPUT: VolAddress = unsafe { VolAddress::new_unchecked(0x400_0 /// A "tribool" value helps us interpret the arrow pad. #[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(i32)] -#[allow(missing_docs)] pub enum TriBool { + /// -1 Minus = -1, + /// +0 Neutral = 0, + /// +1 Plus = 1, } diff --git a/src/oam.rs b/src/oam.rs index f08016f..f9c0cef 100644 --- a/src/oam.rs +++ b/src/oam.rs @@ -20,7 +20,7 @@ impl OBJAttr0 { multi_bits!( u16, [ - (0, 8, y_coordinate), + (0, 8, row_coordinate), (8, 2, obj_rendering, ObjectRender, Normal, Affine, Disabled, DoubleAreaAffine), (10, 2, obj_mode, ObjectMode, Normal, SemiTransparent, OBJWindow), (14, 2, obj_shape, ObjectShape, Square, Horizontal, Vertical), @@ -86,7 +86,7 @@ impl OBJAttr1 { multi_bits!( u16, [ - (0, 9, x_coordinate), + (0, 9, col_coordinate), (9, 5, affine_index), (14, 2, obj_size, ObjectSize, Zero, One, Two, Three), ]