diff --git a/agb/examples/chicken.rs b/agb/examples/chicken.rs index 344952e1..bcb48aaf 100644 --- a/agb/examples/chicken.rs +++ b/agb/examples/chicken.rs @@ -2,11 +2,8 @@ #![no_main] use agb::{ - display::{ - background::{TileFormat, TileSet, TileSetting}, - object::ObjectStandard, - HEIGHT, WIDTH, - }, + display::tiled::{TileFormat, TileSet}, + display::{background::TileSetting, object::ObjectStandard, HEIGHT, WIDTH}, input::Button, }; use core::convert::TryInto; diff --git a/agb/src/display/mod.rs b/agb/src/display/mod.rs index b5c2ed73..03453d10 100644 --- a/agb/src/display/mod.rs +++ b/agb/src/display/mod.rs @@ -5,7 +5,7 @@ use video::Video; use self::object::ObjectControl; -mod tiled; +pub mod tiled; /// Graphics mode 0. Four regular backgrounds. pub mod background; diff --git a/examples/the-hat-chooses-the-wizard/src/level_display.rs b/examples/the-hat-chooses-the-wizard/src/level_display.rs index 599594ca..ccf45fa8 100644 --- a/examples/the-hat-chooses-the-wizard/src/level_display.rs +++ b/examples/the-hat-chooses-the-wizard/src/level_display.rs @@ -1,5 +1,6 @@ use agb::display::{ - background::{RegularMap, TileSetReference, TileSetting, VRamManager}, + background::{RegularMap, TileSetting, VRamManager}, + tiled::TileSetReference, HEIGHT, WIDTH, }; diff --git a/examples/the-hat-chooses-the-wizard/src/main.rs b/examples/the-hat-chooses-the-wizard/src/main.rs index ad548088..c91a8165 100644 --- a/examples/the-hat-chooses-the-wizard/src/main.rs +++ b/examples/the-hat-chooses-the-wizard/src/main.rs @@ -5,10 +5,9 @@ extern crate alloc; use agb::{ display::{ - background::{ - InfiniteScrolledMap, PartialUpdateStatus, TileFormat, TileSet, TileSetting, VRamManager, - }, + background::{InfiniteScrolledMap, PartialUpdateStatus, TileSetting, VRamManager}, object::{ObjectControl, ObjectStandard, Size}, + tiled::{TileFormat, TileSet}, Priority, HEIGHT, WIDTH, }, fixnum::{FixedNum, Vector2D}, diff --git a/examples/the-hat-chooses-the-wizard/src/splash_screen.rs b/examples/the-hat-chooses-the-wizard/src/splash_screen.rs index cdf185ca..584ba5eb 100644 --- a/examples/the-hat-chooses-the-wizard/src/splash_screen.rs +++ b/examples/the-hat-chooses-the-wizard/src/splash_screen.rs @@ -1,6 +1,9 @@ use super::sfx::MusicBox; use agb::{ - display::background::{RegularMap, TileFormat, TileSet, TileSetting, VRamManager}, + display::{ + background::{RegularMap, TileSetting, VRamManager}, + tiled::{TileFormat, TileSet}, + }, sound::mixer::Mixer, };