From 22c6e37c8881ead6b29d97f4fb8af1a0056dec6c Mon Sep 17 00:00:00 2001
From: Gwilym Kuiper <gw@ilym.me>
Date: Sat, 19 Feb 2022 21:16:43 +0000
Subject: [PATCH] Finally extract InfiniteScrolledMap

---
 agb/src/display/mod.rs                                      | 6 ++----
 .../{background.rs => tiled/infinite_scrolled_map.rs}       | 3 +--
 agb/src/display/tiled/mod.rs                                | 2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename agb/src/display/{background.rs => tiled/infinite_scrolled_map.rs} (98%)

diff --git a/agb/src/display/mod.rs b/agb/src/display/mod.rs
index 03453d10..fe6b5579 100644
--- a/agb/src/display/mod.rs
+++ b/agb/src/display/mod.rs
@@ -5,10 +5,6 @@ use video::Video;
 
 use self::object::ObjectControl;
 
-pub mod tiled;
-
-/// Graphics mode 0. Four regular backgrounds.
-pub mod background;
 /// Graphics mode 3. Bitmap mode that provides a 16-bit colour framebuffer.
 pub mod bitmap3;
 /// Graphics mode 4. Bitmap 4 provides two 8-bit paletted framebuffers with page switching.
@@ -21,6 +17,8 @@ pub mod object;
 pub mod palette16;
 /// Data produced by agb-image-converter
 pub mod tile_data;
+/// Graphics mode 0. Four regular backgrounds.
+pub mod tiled;
 /// Giving out graphics mode.
 pub mod video;
 
diff --git a/agb/src/display/background.rs b/agb/src/display/tiled/infinite_scrolled_map.rs
similarity index 98%
rename from agb/src/display/background.rs
rename to agb/src/display/tiled/infinite_scrolled_map.rs
index 7ee8b6b3..01bce594 100644
--- a/agb/src/display/background.rs
+++ b/agb/src/display/tiled/infinite_scrolled_map.rs
@@ -1,7 +1,6 @@
 use alloc::boxed::Box;
 
-pub use super::tiled::VRamManager;
-use super::tiled::{MapLoan, RegularMap, TileSetReference, TileSetting};
+use super::{MapLoan, RegularMap, TileSetReference, TileSetting, VRamManager};
 
 use crate::{
     display,
diff --git a/agb/src/display/tiled/mod.rs b/agb/src/display/tiled/mod.rs
index e8908e42..cc09c015 100644
--- a/agb/src/display/tiled/mod.rs
+++ b/agb/src/display/tiled/mod.rs
@@ -1,7 +1,9 @@
+mod infinite_scrolled_map;
 mod map;
 mod tiled0;
 mod vram_manager;
 
+pub use infinite_scrolled_map::InfiniteScrolledMap;
 pub use map::{MapLoan, RegularMap};
 pub use tiled0::Tiled0;
 pub use vram_manager::{TileFormat, TileIndex, TileSet, TileSetReference, VRamManager};