diff --git a/agb/src/display/example_logo.rs b/agb/src/display/example_logo.rs index 6de11ae5..c35f81f1 100644 --- a/agb/src/display/example_logo.rs +++ b/agb/src/display/example_logo.rs @@ -1,5 +1,5 @@ -use agb_image_converter::include_gfx; use crate::display::tiled0::Tiled0; +use agb_image_converter::include_gfx; include_gfx!("gfx/agb_logo.toml"); diff --git a/agb/src/display/mod.rs b/agb/src/display/mod.rs index 9b00c4e2..b3d68bad 100644 --- a/agb/src/display/mod.rs +++ b/agb/src/display/mod.rs @@ -16,14 +16,14 @@ pub mod example_logo; pub mod object; /// Palette type. pub mod palette16; +/// Data produced by agb-image-converter +pub mod tile_data; /// Graphics mode 0. Four regular backgrounds. pub mod tiled0; /// Syscall for waiting for vblank. pub mod vblank; /// Giving out graphics mode. pub mod video; -/// Data produced by agb-image-converter -pub mod tile_data; const DISPLAY_CONTROL: MemoryMapped = unsafe { MemoryMapped::new(0x0400_0000) }; const DISPLAY_STATUS: MemoryMapped = unsafe { MemoryMapped::new(0x0400_0004) }; diff --git a/agb/src/display/tile_data.rs b/agb/src/display/tile_data.rs index aa6630ef..a8698e82 100644 --- a/agb/src/display/tile_data.rs +++ b/agb/src/display/tile_data.rs @@ -7,11 +7,15 @@ pub struct TileData { } impl TileData { - pub const fn new(palettes: &'static [Palette16], tiles: &'static [u32], palette_assignments: &'static [u8]) -> Self { + pub const fn new( + palettes: &'static [Palette16], + tiles: &'static [u32], + palette_assignments: &'static [u8], + ) -> Self { TileData { palettes, tiles, palette_assignments, } } -} \ No newline at end of file +}