mirror of
https://github.com/italicsjenga/agb.git
synced 2024-12-24 00:31:34 +11:00
Run rustfmt on modified files in agb
This commit is contained in:
parent
061b8be368
commit
21a11a4e41
|
@ -1,5 +1,5 @@
|
||||||
use agb_image_converter::include_gfx;
|
|
||||||
use crate::display::tiled0::Tiled0;
|
use crate::display::tiled0::Tiled0;
|
||||||
|
use agb_image_converter::include_gfx;
|
||||||
|
|
||||||
include_gfx!("gfx/agb_logo.toml");
|
include_gfx!("gfx/agb_logo.toml");
|
||||||
|
|
||||||
|
|
|
@ -16,14 +16,14 @@ pub mod example_logo;
|
||||||
pub mod object;
|
pub mod object;
|
||||||
/// Palette type.
|
/// Palette type.
|
||||||
pub mod palette16;
|
pub mod palette16;
|
||||||
|
/// Data produced by agb-image-converter
|
||||||
|
pub mod tile_data;
|
||||||
/// Graphics mode 0. Four regular backgrounds.
|
/// Graphics mode 0. Four regular backgrounds.
|
||||||
pub mod tiled0;
|
pub mod tiled0;
|
||||||
/// Syscall for waiting for vblank.
|
/// Syscall for waiting for vblank.
|
||||||
pub mod vblank;
|
pub mod vblank;
|
||||||
/// Giving out graphics mode.
|
/// Giving out graphics mode.
|
||||||
pub mod video;
|
pub mod video;
|
||||||
/// Data produced by agb-image-converter
|
|
||||||
pub mod tile_data;
|
|
||||||
|
|
||||||
const DISPLAY_CONTROL: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x0400_0000) };
|
const DISPLAY_CONTROL: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x0400_0000) };
|
||||||
const DISPLAY_STATUS: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x0400_0004) };
|
const DISPLAY_STATUS: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x0400_0004) };
|
||||||
|
|
|
@ -7,11 +7,15 @@ pub struct TileData {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl 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 {
|
TileData {
|
||||||
palettes,
|
palettes,
|
||||||
tiles,
|
tiles,
|
||||||
palette_assignments,
|
palette_assignments,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue