From cb127c7924cffe462b0dcf009514cbb6efd01c94 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 21:53:13 +0100
Subject: [PATCH 01/14] New include_gfx macro

---
 agb-image-converter/src/lib.rs  | 147 ++++++++++++++++++++++++++++++--
 agb/src/display/example_logo.rs |   2 +-
 agb/src/lib.rs                  |   3 +
 3 files changed, 144 insertions(+), 8 deletions(-)

diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs
index 257a53b5..f4f03d87 100644
--- a/agb-image-converter/src/lib.rs
+++ b/agb-image-converter/src/lib.rs
@@ -2,9 +2,9 @@ use palette16::{Palette16OptimisationResults, Palette16Optimiser};
 use palette256::Palette256;
 use proc_macro::TokenStream;
 use proc_macro2::Literal;
-use syn::parse::Parser;
+use syn::parse::{Parse, Parser};
 use syn::{parse_macro_input, punctuated::Punctuated, LitStr};
-use syn::{Expr, ExprLit, Lit};
+use syn::{Expr, ExprLit, Lit, Token};
 
 use std::collections::HashMap;
 use std::path::PathBuf;
@@ -33,6 +33,7 @@ pub(crate) enum TileSize {
     Tile32,
 }
 
+#[derive(Debug, Clone, Copy)]
 pub(crate) enum Colours {
     Colours16,
     Colours256,
@@ -48,6 +49,132 @@ impl TileSize {
     }
 }
 
+struct BackgroundGfxOption {
+    module_name: String,
+    file_name: String,
+    colours: Colours,
+}
+
+impl config::Image for BackgroundGfxOption {
+    fn filename(&self) -> String {
+        self.file_name.clone()
+    }
+
+    fn tile_size(&self) -> TileSize {
+        TileSize::Tile8
+    }
+
+    fn colours(&self) -> Colours {
+        self.colours
+    }
+}
+
+impl Parse for BackgroundGfxOption {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let lookahead = input.lookahead1();
+
+        let module_name: syn::Ident = input.parse()?;
+        let _: Token![=>] = input.parse()?;
+
+        let colours = if lookahead.peek(syn::LitInt) {
+            let num_colours: syn::LitInt = input.parse()?;
+
+            match num_colours.base10_parse()? {
+                16 => Colours::Colours16,
+                256 => Colours::Colours256,
+                _ => {
+                    return Err(syn::Error::new_spanned(
+                        num_colours,
+                        "Number of colours must be 16 or 256",
+                    ))
+                }
+            }
+        } else {
+            Colours::Colours16
+        };
+
+        let file_name: syn::LitStr = input.parse()?;
+
+        Ok(Self {
+            module_name: module_name.to_string(),
+            file_name: file_name.value(),
+            colours,
+        })
+    }
+}
+
+struct IncludeBackgroundGfxInput {
+    module_name: syn::Ident,
+    crate_prefix: String,
+    transparent_colour: Colour,
+    background_gfx_options: Vec<BackgroundGfxOption>,
+}
+
+impl Parse for IncludeBackgroundGfxInput {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let lookahead = input.lookahead1();
+
+        let crate_prefix: syn::Ident = if lookahead.peek(Token![crate]) {
+            let _: Token![crate] = input.parse()?;
+            let _: Token![,] = input.parse()?;
+            format_ident!("crate")
+        } else {
+            format_ident!("agb")
+        };
+
+        let module_name: syn::Ident = input.parse()?;
+        let _: Token![,] = input.parse()?;
+
+        let transparent_colour: Colour = if lookahead.peek(syn::LitStr) {
+            let colour_str: syn::LitStr = input.parse()?;
+            let _: Token![,] = input.parse()?;
+            colour_str
+                .value()
+                .parse()
+                .map_err(|msg| syn::Error::new_spanned(colour_str, msg))?
+        } else {
+            Colour::from_rgb(255, 0, 255, 0)
+        };
+
+        let background_gfx_options =
+            input.parse_terminated(BackgroundGfxOption::parse, Token![,])?;
+
+        Ok(Self {
+            module_name,
+            crate_prefix: crate_prefix.to_string(),
+            transparent_colour,
+            background_gfx_options: background_gfx_options.into_iter().collect(),
+        })
+    }
+}
+
+impl config::Config for IncludeBackgroundGfxInput {
+    fn crate_prefix(&self) -> String {
+        self.crate_prefix.clone()
+    }
+
+    fn images(&self) -> HashMap<String, &dyn config::Image> {
+        self.background_gfx_options
+            .iter()
+            .map(|options| (options.module_name.clone(), options as &dyn config::Image))
+            .collect()
+    }
+
+    fn transparent_colour(&self) -> Option<Colour> {
+        Some(self.transparent_colour)
+    }
+}
+
+#[proc_macro]
+pub fn include_background_gfx(input: TokenStream) -> TokenStream {
+    let config = Box::new(parse_macro_input!(input as IncludeBackgroundGfxInput));
+
+    let root = std::env::var("CARGO_MANIFEST_DIR").expect("Failed to get cargo manifest dir");
+
+    let module_name = config.module_name.clone();
+    include_gfx_from_config(config, module_name, Path::new(&root))
+}
+
 #[proc_macro]
 pub fn include_gfx(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as syn::LitStr);
@@ -56,20 +183,28 @@ pub fn include_gfx(input: TokenStream) -> TokenStream {
 
     let root = std::env::var("CARGO_MANIFEST_DIR").expect("Failed to get cargo manifest dir");
     let path = Path::new(&root).join(&*filename);
+
+    let config = config::parse(&path.to_string_lossy());
+
     let parent = path
         .parent()
         .expect("Expected a parent directory for the path");
 
-    let config = config::parse(&path.to_string_lossy());
-
     let module_name = format_ident!(
         "{}",
         path.file_stem()
             .expect("Expected a file stem")
             .to_string_lossy()
     );
-    let include_path = path.to_string_lossy();
 
+    include_gfx_from_config(config, module_name, parent)
+}
+
+fn include_gfx_from_config(
+    config: Box<dyn config::Config>,
+    module_name: syn::Ident,
+    parent: &Path,
+) -> TokenStream {
     let images = config.images();
 
     let mut optimiser = Palette16Optimiser::new(config.transparent_colour());
@@ -132,8 +267,6 @@ pub fn include_gfx(input: TokenStream) -> TokenStream {
 
     let module = quote! {
         mod #module_name {
-            const _: &[u8] = include_bytes!(#include_path);
-
             #palette_code
 
             #(#image_code)*
diff --git a/agb/src/display/example_logo.rs b/agb/src/display/example_logo.rs
index 1a723b8b..351d80ab 100644
--- a/agb/src/display/example_logo.rs
+++ b/agb/src/display/example_logo.rs
@@ -1,6 +1,6 @@
 use super::tiled::{RegularMap, TileFormat, TileSet, TileSetting, TiledMap, VRamManager};
 
-crate::include_gfx!("gfx/agb_logo.toml");
+crate::include_background_gfx!(crate, agb_logo, test_logo => "gfx/test_logo.png");
 
 pub fn display_logo(map: &mut RegularMap, vram: &mut VRamManager) {
     vram.set_background_palettes(agb_logo::PALETTES);
diff --git a/agb/src/lib.rs b/agb/src/lib.rs
index 90bd7166..7e3b680c 100644
--- a/agb/src/lib.rs
+++ b/agb/src/lib.rs
@@ -13,6 +13,7 @@
 #![feature(alloc_error_handler)]
 #![feature(allocator_api)]
 #![feature(asm_const)]
+#![feature(trace_macros)]
 #![warn(clippy::all)]
 #![deny(clippy::must_use_candidate)]
 #![deny(clippy::trivially_copy_pass_by_ref)]
@@ -120,6 +121,8 @@ pub use agb_image_converter::include_aseprite_inner;
 #[doc(hidden)]
 pub use agb_image_converter::include_font as include_font_inner;
 
+pub use agb_image_converter::include_background_gfx;
+
 #[macro_export]
 macro_rules! include_font {
     ($font_path: literal, $font_size: literal) => {{

From 65877b1d3213d01f834ed76c9ba442e31c16c216 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 21:53:28 +0100
Subject: [PATCH 02/14] Delete this file now

---
 agb/gfx/agb_logo.toml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 agb/gfx/agb_logo.toml

diff --git a/agb/gfx/agb_logo.toml b/agb/gfx/agb_logo.toml
deleted file mode 100644
index 60787767..00000000
--- a/agb/gfx/agb_logo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-version = "1.0"
-
-# Only needed for within the agb crate
-crate_prefix = "crate"
-
-[image.test_logo]
-filename = "test_logo.png"
-tile_size = "8x8"

From eac350b3915cb18f29c24f9cd254ec2285bf4640 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:01:37 +0100
Subject: [PATCH 03/14] Replace example usage with the new macro

---
 agb-image-converter/src/lib.rs      | 5 +++--
 agb/examples/affine_background.rs   | 4 ++--
 agb/examples/affine_tiles.toml      | 6 ------
 agb/examples/animated_background.rs | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 agb/examples/affine_tiles.toml

diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs
index f4f03d87..dfb10a5c 100644
--- a/agb-image-converter/src/lib.rs
+++ b/agb-image-converter/src/lib.rs
@@ -71,11 +71,11 @@ impl config::Image for BackgroundGfxOption {
 
 impl Parse for BackgroundGfxOption {
     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
-        let lookahead = input.lookahead1();
-
         let module_name: syn::Ident = input.parse()?;
         let _: Token![=>] = input.parse()?;
 
+        let lookahead = input.lookahead1();
+
         let colours = if lookahead.peek(syn::LitInt) {
             let num_colours: syn::LitInt = input.parse()?;
 
@@ -125,6 +125,7 @@ impl Parse for IncludeBackgroundGfxInput {
         let module_name: syn::Ident = input.parse()?;
         let _: Token![,] = input.parse()?;
 
+        let lookahead = input.lookahead1();
         let transparent_colour: Colour = if lookahead.peek(syn::LitStr) {
             let colour_str: syn::LitStr = input.parse()?;
             let _: Token![,] = input.parse()?;
diff --git a/agb/examples/affine_background.rs b/agb/examples/affine_background.rs
index 69b63032..a0bdd1ab 100644
--- a/agb/examples/affine_background.rs
+++ b/agb/examples/affine_background.rs
@@ -8,10 +8,10 @@ use agb::{
         Priority,
     },
     fixnum::{num, Num},
-    include_gfx,
+    include_background_gfx,
 };
 
-include_gfx!("examples/affine_tiles.toml");
+include_background_gfx!(affine_tiles, water_tiles => 256 "examples/water_tiles.png");
 
 #[agb::entry]
 fn main(mut gba: agb::Gba) -> ! {
diff --git a/agb/examples/affine_tiles.toml b/agb/examples/affine_tiles.toml
deleted file mode 100644
index 65d608a2..00000000
--- a/agb/examples/affine_tiles.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-version = "1.0"
-
-[image.water_tiles]
-filename = "water_tiles.png"
-tile_size = "8x8"
-colours = 256
\ No newline at end of file
diff --git a/agb/examples/animated_background.rs b/agb/examples/animated_background.rs
index 8ae95c8d..31ef37b1 100644
--- a/agb/examples/animated_background.rs
+++ b/agb/examples/animated_background.rs
@@ -6,10 +6,10 @@ use agb::{
         tiled::{RegularBackgroundSize, TileFormat, TileSet, TileSetting, TiledMap},
         Priority,
     },
-    include_gfx,
+    include_background_gfx,
 };
 
-include_gfx!("examples/water_tiles.toml");
+include_background_gfx!(water_tiles, water_tiles => "examples/water_tiles.png");
 
 #[agb::entry]
 fn main(mut gba: agb::Gba) -> ! {

From f53cd9b25ad6897ce6919ccba485d6a10f912f85 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:06:06 +0100
Subject: [PATCH 04/14] Write some terrible documentation

---
 agb/src/lib.rs | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/agb/src/lib.rs b/agb/src/lib.rs
index 7e3b680c..e4c37070 100644
--- a/agb/src/lib.rs
+++ b/agb/src/lib.rs
@@ -36,43 +36,28 @@
 
 /// This macro is used to convert a png or bmp into a format usable by the Game Boy Advance.
 ///
-/// The macro expects to be linked to a `toml` file which contains a metadata about the image
-/// and a link to the png or bmp itself. See the examples below for a full definition of the format.
+/// Suppose you have a file in `examples/water_tiles.png` which contains some tiles you'd like to use.
 ///
-/// # The manifest file format
-///
-/// The following is an example of the toml file you would need to create. Generally you will
-/// find this in the `gfx` folder in the same level as the `src` folder (see the examples).
-///
-/// Suppose that the following is in `examples/water_tiles.toml`.
-///
-/// ```toml
-/// version = "1.0"
-///
-/// [image.tiles]
-/// filename = "water_tiles.png"
-/// tile_size = "8x8"
-/// ```
-///
-/// You then import this using:
+/// You import them using:
 /// ```rust,no_run
 /// ##![no_std]
 /// ##![no_main]
-/// agb::include_gfx!("examples/water_tiles.toml");
+/// agb::include_background_gfx!(water_tiles, tiles => "examples/water_tiles.png");
 /// ```
 ///
 /// This will generate something along the lines of the following:
 ///
 /// ```rust,ignore
-/// // module name comes from the name of the toml file, so `water_tiles` in this case because it is
-/// // called `water_tiles.toml`
+/// // module name comes from the first argument, name of the constant from the arrow
 /// mod water_tiles {
-///     const tiles = /* ... */;
+///     pub const tiles = /* ... */;
 /// }
 /// ```
 ///
 /// And tiles will be an instance of [`TileData`][crate::display::tile_data::TileData]
 ///
+/// You can import multiple files at once, and the palette data will be combined so they can all be visible.
+///
 /// # Examples
 ///
 /// Assume the tiles are loaded as above
@@ -90,10 +75,10 @@
 ///     include_gfx,
 /// };
 ///
-/// agb::include_gfx!("examples/water_tiles.toml");
+/// agb::include_background_gfx!(water_tiles, tiles => "exmaples/water_tiles.png");
 ///
 /// # fn load_tileset(mut gfx: Tiled0, mut vram: VRamManager) {
-/// let tileset = TileSet::new(water_tiles::water_tiles.tiles, TileFormat::FourBpp);
+/// let tileset = TileSet::new(water_tiles::tiles.tiles, TileFormat::FourBpp);
 ///
 /// vram.set_background_palettes(water_tiles::PALETTES);
 ///
@@ -113,7 +98,7 @@
 /// bg.show();
 /// # }
 /// ```
-pub use agb_image_converter::include_gfx;
+pub use agb_image_converter::include_background_gfx;
 
 #[doc(hidden)]
 pub use agb_image_converter::include_aseprite_inner;
@@ -121,8 +106,6 @@ pub use agb_image_converter::include_aseprite_inner;
 #[doc(hidden)]
 pub use agb_image_converter::include_font as include_font_inner;
 
-pub use agb_image_converter::include_background_gfx;
-
 #[macro_export]
 macro_rules! include_font {
     ($font_path: literal, $font_size: literal) => {{

From 875a0fbb659c88a73e1ebd03196e2372da757500 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:14:44 +0100
Subject: [PATCH 05/14] Remove unneeded stuff from image-converter

---
 agb-image-converter/Cargo.toml                |   2 -
 agb-image-converter/src/config.rs             | 111 ------------------
 agb-image-converter/src/lib.rs                |  29 -----
 examples/hyperspace-roll/gfx/backgrounds.toml |  22 ----
 examples/hyperspace-roll/src/background.rs    |  10 +-
 .../gfx/splash_screens.toml                   |  11 --
 .../gfx/tile_sheet.toml                       |   7 --
 .../the-hat-chooses-the-wizard/src/lib.rs     |   2 +-
 .../src/splash_screen.rs                      |   5 +-
 examples/the-purple-night/gfx/background.toml |   7 --
 examples/the-purple-night/src/lib.rs          |   2 +-
 11 files changed, 14 insertions(+), 194 deletions(-)
 delete mode 100644 examples/hyperspace-roll/gfx/backgrounds.toml
 delete mode 100644 examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml
 delete mode 100644 examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml
 delete mode 100644 examples/the-purple-night/gfx/background.toml

diff --git a/agb-image-converter/Cargo.toml b/agb-image-converter/Cargo.toml
index d787fcc2..162bd704 100644
--- a/agb-image-converter/Cargo.toml
+++ b/agb-image-converter/Cargo.toml
@@ -12,8 +12,6 @@ proc-macro = true
 
 [dependencies]
 image = { version = "0.23", default-features = false, features = [ "png", "bmp" ] }
-toml = "0.7"
-serde = { version = "1", features = ["derive"] }
 syn = { version = "2", features = ["full"] }
 proc-macro2 = "1"
 quote = "1"
diff --git a/agb-image-converter/src/config.rs b/agb-image-converter/src/config.rs
index bdc498e0..daa112b9 100644
--- a/agb-image-converter/src/config.rs
+++ b/agb-image-converter/src/config.rs
@@ -1,25 +1,7 @@
-use serde::Deserialize;
 use std::collections::HashMap;
-use std::fs;
 
 use crate::{Colour, Colours, TileSize};
 
-pub(crate) fn parse(filename: &str) -> Box<dyn Config> {
-    let config_toml =
-        fs::read_to_string(filename).unwrap_or_else(|_| panic!("Failed to read file {filename}"));
-
-    let config: ConfigV1 = toml::from_str(&config_toml).expect("Failed to parse file");
-
-    if config.version != "1.0" {
-        panic!(
-            "Expected version of {} to be 1.0, got {}",
-            filename, config.version
-        );
-    }
-
-    Box::new(config)
-}
-
 pub(crate) trait Config {
     fn crate_prefix(&self) -> String;
     fn images(&self) -> HashMap<String, &dyn Image>;
@@ -31,96 +13,3 @@ pub(crate) trait Image {
     fn tile_size(&self) -> TileSize;
     fn colours(&self) -> Colours;
 }
-
-#[derive(Deserialize)]
-pub struct ConfigV1 {
-    version: String,
-    crate_prefix: Option<String>,
-    transparent_colour: Option<String>,
-
-    image: HashMap<String, ImageV1>,
-}
-
-impl Config for ConfigV1 {
-    fn crate_prefix(&self) -> String {
-        self.crate_prefix
-            .clone()
-            .unwrap_or_else(|| "agb".to_owned())
-    }
-
-    fn images(&self) -> HashMap<String, &dyn Image> {
-        self.image
-            .iter()
-            .map(|(filename, image)| (filename.clone(), image as &dyn Image))
-            .collect()
-    }
-
-    fn transparent_colour(&self) -> Option<Colour> {
-        if let Some(colour) = &self
-            .transparent_colour
-            .as_ref()
-            .map(|colour| colour.parse().unwrap())
-        {
-            return Some(*colour);
-        }
-
-        self.image
-            .values()
-            .flat_map(|image| image.transparent_colour())
-            .next()
-    }
-}
-
-#[derive(Deserialize)]
-pub struct ImageV1 {
-    filename: String,
-    transparent_colour: Option<String>,
-    tile_size: TileSizeV1,
-    colours: Option<u32>,
-}
-
-impl Image for ImageV1 {
-    fn filename(&self) -> String {
-        self.filename.clone()
-    }
-
-    fn tile_size(&self) -> TileSize {
-        self.tile_size.into()
-    }
-
-    fn colours(&self) -> Colours {
-        match self.colours {
-            None | Some(16) => Colours::Colours16,
-            Some(256) => Colours::Colours256,
-            _ => panic!("colours must either not be set or 16 or 256"),
-        }
-    }
-}
-
-impl ImageV1 {
-    fn transparent_colour(&self) -> Option<Colour> {
-        self.transparent_colour
-            .as_ref()
-            .map(|colour| colour.parse().unwrap())
-    }
-}
-
-#[derive(Deserialize, Clone, Copy)]
-pub enum TileSizeV1 {
-    #[serde(rename = "8x8")]
-    Tile8,
-    #[serde(rename = "16x16")]
-    Tile16,
-    #[serde(rename = "32x32")]
-    Tile32,
-}
-
-impl From<TileSizeV1> for TileSize {
-    fn from(item: TileSizeV1) -> Self {
-        match item {
-            TileSizeV1::Tile8 => TileSize::Tile8,
-            TileSizeV1::Tile16 => TileSize::Tile16,
-            TileSizeV1::Tile32 => TileSize::Tile32,
-        }
-    }
-}
diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs
index dfb10a5c..d1a786f0 100644
--- a/agb-image-converter/src/lib.rs
+++ b/agb-image-converter/src/lib.rs
@@ -29,8 +29,6 @@ use colour::Colour;
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum TileSize {
     Tile8,
-    Tile16,
-    Tile32,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -43,8 +41,6 @@ impl TileSize {
     fn to_size(self) -> usize {
         match self {
             TileSize::Tile8 => 8,
-            TileSize::Tile16 => 16,
-            TileSize::Tile32 => 32,
         }
     }
 }
@@ -176,31 +172,6 @@ pub fn include_background_gfx(input: TokenStream) -> TokenStream {
     include_gfx_from_config(config, module_name, Path::new(&root))
 }
 
-#[proc_macro]
-pub fn include_gfx(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as syn::LitStr);
-
-    let filename = input.value();
-
-    let root = std::env::var("CARGO_MANIFEST_DIR").expect("Failed to get cargo manifest dir");
-    let path = Path::new(&root).join(&*filename);
-
-    let config = config::parse(&path.to_string_lossy());
-
-    let parent = path
-        .parent()
-        .expect("Expected a parent directory for the path");
-
-    let module_name = format_ident!(
-        "{}",
-        path.file_stem()
-            .expect("Expected a file stem")
-            .to_string_lossy()
-    );
-
-    include_gfx_from_config(config, module_name, parent)
-}
-
 fn include_gfx_from_config(
     config: Box<dyn config::Config>,
     module_name: syn::Ident,
diff --git a/examples/hyperspace-roll/gfx/backgrounds.toml b/examples/hyperspace-roll/gfx/backgrounds.toml
deleted file mode 100644
index 6fe2df1e..00000000
--- a/examples/hyperspace-roll/gfx/backgrounds.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-version = "1.0"
-transparent_colour = "121105"
-
-[image.stars]
-filename = "stars.png"
-tile_size = "8x8"
-
-[image.title]
-filename = "title-screen.png"
-tile_size = "8x8"
-
-[image.help]
-filename = "help-text.png"
-tile_size = "8x8"
-
-[image.descriptions1]
-filename = "descriptions1.png"
-tile_size = "8x8"
-
-[image.descriptions2]
-filename = "descriptions2.png"
-tile_size = "8x8"
diff --git a/examples/hyperspace-roll/src/background.rs b/examples/hyperspace-roll/src/background.rs
index 001a8b0d..85609f85 100644
--- a/examples/hyperspace-roll/src/background.rs
+++ b/examples/hyperspace-roll/src/background.rs
@@ -1,11 +1,17 @@
 use agb::{
     display::tiled::{RegularMap, TileFormat, TileSet, TileSetting, TiledMap, VRamManager},
-    include_gfx, rng,
+    include_background_gfx, rng,
 };
 
 use crate::sfx::Sfx;
 
-include_gfx!("gfx/backgrounds.toml");
+include_background_gfx!(backgrounds, "121105",
+    stars => "gfx/stars.png",
+    title => "gfx/title-screen.png",
+    help => "gfx/help-text.png",
+    descriptions1 => "gfx/descriptions1.png",
+    descriptions2 => "gfx/descriptions2.png",
+);
 
 pub fn load_palettes(vram: &mut VRamManager) {
     vram.set_background_palettes(backgrounds::PALETTES);
diff --git a/examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml b/examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml
deleted file mode 100644
index fea8a855..00000000
--- a/examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-version = "1.0"
-
-transparent_colour = "2ce8f4"
-
-[image.thanks_for_playing]
-filename = "thanks_for_playing.png"
-tile_size = "8x8"
-
-[image.splash]
-filename = "splash.png"
-tile_size = "8x8"
diff --git a/examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml b/examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml
deleted file mode 100644
index 4ef16fc0..00000000
--- a/examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-version = "1.0"
-
-transparent_colour = "2ce8f4"
-
-[image.background]
-filename = "tile_sheet.png"
-tile_size = "8x8"
diff --git a/examples/the-hat-chooses-the-wizard/src/lib.rs b/examples/the-hat-chooses-the-wizard/src/lib.rs
index cfd98e30..2161cae6 100644
--- a/examples/the-hat-chooses-the-wizard/src/lib.rs
+++ b/examples/the-hat-chooses-the-wizard/src/lib.rs
@@ -101,7 +101,7 @@ mod map_tiles {
     }
 }
 
-agb::include_gfx!("gfx/tile_sheet.toml");
+agb::include_background_gfx!(tile_sheet, "2ce8f4", background => "gfx/tile_sheet.png");
 
 const GRAPHICS: &Graphics = agb::include_aseprite!("gfx/sprites.aseprite");
 const TAG_MAP: &TagMap = GRAPHICS.tags();
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 80883647..fb90190f 100644
--- a/examples/the-hat-chooses-the-wizard/src/splash_screen.rs
+++ b/examples/the-hat-chooses-the-wizard/src/splash_screen.rs
@@ -1,7 +1,10 @@
 use super::sfx::SfxPlayer;
 use agb::display::tiled::{RegularMap, TileFormat, TileSet, TileSetting, TiledMap, VRamManager};
 
-agb::include_gfx!("gfx/splash_screens.toml");
+agb::include_background_gfx!(splash_screens,
+    splash => "gfx/splash.png",
+    thanks_for_playing => "gfx/thanks_for_playing.png",
+);
 
 pub enum SplashScreen {
     Start,
diff --git a/examples/the-purple-night/gfx/background.toml b/examples/the-purple-night/gfx/background.toml
deleted file mode 100644
index c9a8ac22..00000000
--- a/examples/the-purple-night/gfx/background.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-version = "1.0"
-
-transparent_colour = "53269a"
-
-[image.background]
-filename = "background.png"
-tile_size = "8x8"
diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs
index 4325f879..9be41653 100644
--- a/examples/the-purple-night/src/lib.rs
+++ b/examples/the-purple-night/src/lib.rs
@@ -57,7 +57,7 @@ const SWORDLESS_JUMP: &Tag = TAG_MAP.get("jump swordless");
 const SWORDLESS_ATTACK: &Tag = KNIFE_ATTACK;
 const SWORDLESS_JUMP_ATTACK: &Tag = KNIFE_JUMP_ATTACK;
 
-agb::include_gfx!("gfx/background.toml");
+agb::include_background_gfx!(background, "53269a", background => "gfx/background.png");
 
 type Number = FixedNum<8>;
 

From 11891e574f4ae100effa552fc13efb53fb4c72c0 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:15:53 +0100
Subject: [PATCH 06/14] Remove some features from syn

---
 agb-image-converter/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agb-image-converter/Cargo.toml b/agb-image-converter/Cargo.toml
index 162bd704..4978edde 100644
--- a/agb-image-converter/Cargo.toml
+++ b/agb-image-converter/Cargo.toml
@@ -12,7 +12,7 @@ proc-macro = true
 
 [dependencies]
 image = { version = "0.23", default-features = false, features = [ "png", "bmp" ] }
-syn = { version = "2", features = ["full"] }
+syn = { version = "2", features = ["proc-macro", "parsing"] }
 proc-macro2 = "1"
 quote = "1"
 asefile = "0.3.5"

From 498236d064b3227a407321b2b53f5f9d3ba10d4a Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:18:13 +0100
Subject: [PATCH 07/14] Remove tile size

---
 agb-image-converter/src/config.rs         |  3 +--
 agb-image-converter/src/lib.rs            | 31 ++++-------------------
 agb-image-converter/src/rust_generator.rs |  9 +++----
 3 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/agb-image-converter/src/config.rs b/agb-image-converter/src/config.rs
index daa112b9..814fced2 100644
--- a/agb-image-converter/src/config.rs
+++ b/agb-image-converter/src/config.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::{Colour, Colours, TileSize};
+use crate::{Colour, Colours};
 
 pub(crate) trait Config {
     fn crate_prefix(&self) -> String;
@@ -10,6 +10,5 @@ pub(crate) trait Config {
 
 pub(crate) trait Image {
     fn filename(&self) -> String;
-    fn tile_size(&self) -> TileSize;
     fn colours(&self) -> Colours;
 }
diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs
index d1a786f0..c8d9c9f3 100644
--- a/agb-image-converter/src/lib.rs
+++ b/agb-image-converter/src/lib.rs
@@ -26,25 +26,12 @@ use image_loader::Image;
 
 use colour::Colour;
 
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum TileSize {
-    Tile8,
-}
-
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum Colours {
     Colours16,
     Colours256,
 }
 
-impl TileSize {
-    fn to_size(self) -> usize {
-        match self {
-            TileSize::Tile8 => 8,
-        }
-    }
-}
-
 struct BackgroundGfxOption {
     module_name: String,
     file_name: String,
@@ -56,10 +43,6 @@ impl config::Image for BackgroundGfxOption {
         self.file_name.clone()
     }
 
-    fn tile_size(&self) -> TileSize {
-        TileSize::Tile8
-    }
-
     fn colours(&self) -> Colours {
         self.colours
     }
@@ -191,7 +174,7 @@ fn include_gfx_from_config(
 
         match settings.colours() {
             Colours::Colours16 => {
-                let tile_size = settings.tile_size().to_size();
+                let tile_size = 8;
                 if image.width % tile_size != 0 || image.height % tile_size != 0 {
                     panic!("Image size not a multiple of tile size");
                 }
@@ -203,7 +186,7 @@ fn include_gfx_from_config(
                     config.transparent_colour(),
                 );
 
-                let num_tiles = image.width * image.height / settings.tile_size().to_size().pow(2);
+                let num_tiles = image.width * image.height / 8usize.pow(2);
                 assignment_offsets.insert(name, assignment_offset);
                 assignment_offset += num_tiles;
             }
@@ -395,7 +378,6 @@ fn convert_image(
         optimisation_results,
         &image,
         &image_filename.to_string_lossy(),
-        settings.tile_size(),
         crate_prefix.to_owned(),
         assignment_offset,
     )
@@ -449,10 +431,9 @@ fn palette_tile_data(
         .collect();
 
     let mut tile_data = Vec::new();
-    let tile_size = TileSize::Tile8;
 
     for image in images {
-        add_image_to_tile_data(&mut tile_data, image, tile_size, optimiser, 0)
+        add_image_to_tile_data(&mut tile_data, image, optimiser, 0)
     }
 
     let tile_data = collapse_to_4bpp(&tile_data);
@@ -472,11 +453,10 @@ fn collapse_to_4bpp(tile_data: &[u8]) -> Vec<u8> {
 fn add_image_to_tile_data(
     tile_data: &mut Vec<u8>,
     image: &Image,
-    tile_size: TileSize,
     optimiser: &Palette16OptimisationResults,
     assignment_offset: usize,
 ) {
-    let tile_size = tile_size.to_size();
+    let tile_size = 8;
     let tiles_x = image.width / tile_size;
     let tiles_y = image.height / tile_size;
 
@@ -502,10 +482,9 @@ fn add_image_to_tile_data(
 fn add_image_256_to_tile_data(
     tile_data: &mut Vec<u8>,
     image: &Image,
-    tile_size: TileSize,
     optimiser: &Palette16OptimisationResults,
 ) {
-    let tile_size = tile_size.to_size();
+    let tile_size = 8;
     let tiles_x = image.width / tile_size;
     let tiles_y = image.height / tile_size;
 
diff --git a/agb-image-converter/src/rust_generator.rs b/agb-image-converter/src/rust_generator.rs
index 84b5632d..49c55001 100644
--- a/agb-image-converter/src/rust_generator.rs
+++ b/agb-image-converter/src/rust_generator.rs
@@ -1,5 +1,5 @@
 use crate::palette16::Palette16OptimisationResults;
-use crate::{add_image_256_to_tile_data, add_image_to_tile_data, collapse_to_4bpp, TileSize};
+use crate::{add_image_256_to_tile_data, add_image_to_tile_data, collapse_to_4bpp};
 use crate::{image_loader::Image, ByteString};
 
 use proc_macro2::TokenStream;
@@ -38,7 +38,6 @@ pub(crate) fn generate_code(
     results: &Palette16OptimisationResults,
     image: &Image,
     image_filename: &str,
-    tile_size: TileSize,
     crate_prefix: String,
     assignment_offset: Option<usize>,
 ) -> TokenStream {
@@ -48,11 +47,11 @@ pub(crate) fn generate_code(
     let (tile_data, assignments) = if let Some(assignment_offset) = assignment_offset {
         let mut tile_data = Vec::new();
 
-        add_image_to_tile_data(&mut tile_data, image, tile_size, results, assignment_offset);
+        add_image_to_tile_data(&mut tile_data, image, results, assignment_offset);
 
         let tile_data = collapse_to_4bpp(&tile_data);
 
-        let num_tiles = image.width * image.height / tile_size.to_size().pow(2);
+        let num_tiles = image.width * image.height / 8usize.pow(2);
 
         let assignments = results
             .assignments
@@ -66,7 +65,7 @@ pub(crate) fn generate_code(
     } else {
         let mut tile_data = Vec::new();
 
-        add_image_256_to_tile_data(&mut tile_data, image, tile_size, results);
+        add_image_256_to_tile_data(&mut tile_data, image, results);
 
         (tile_data, vec![])
     };

From 753f59e0e00c7d215b1ddcb5dc4c054df3f2c564 Mon Sep 17 00:00:00 2001
From: GBA bot <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:31:45 +0100
Subject: [PATCH 08/14] Allow importing aseprite backgrounds directly

---
 agb-image-converter/src/image_loader.rs       |  16 +++++++++++++---
 examples/hyperspace-roll/gfx/help-text.png    | Bin 591 -> 0 bytes
 examples/hyperspace-roll/gfx/stars.png        | Bin 550 -> 0 bytes
 examples/hyperspace-roll/gfx/title-screen.png | Bin 4313 -> 0 bytes
 examples/hyperspace-roll/src/background.rs    |   6 +++---
 examples/the-purple-night/gfx/background.png  | Bin 2082 -> 0 bytes
 examples/the-purple-night/gfx/boss.png        | Bin 3041 -> 0 bytes
 examples/the-purple-night/gfx/objects.png     | Bin 9719 -> 0 bytes
 examples/the-purple-night/src/lib.rs          |   2 +-
 9 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 examples/hyperspace-roll/gfx/help-text.png
 delete mode 100644 examples/hyperspace-roll/gfx/stars.png
 delete mode 100644 examples/hyperspace-roll/gfx/title-screen.png
 delete mode 100644 examples/the-purple-night/gfx/background.png
 delete mode 100644 examples/the-purple-night/gfx/boss.png
 delete mode 100644 examples/the-purple-night/gfx/objects.png

diff --git a/agb-image-converter/src/image_loader.rs b/agb-image-converter/src/image_loader.rs
index 9126a637..81c8fff8 100644
--- a/agb-image-converter/src/image_loader.rs
+++ b/agb-image-converter/src/image_loader.rs
@@ -1,6 +1,6 @@
-use std::path;
+use std::{ffi::OsStr, path};
 
-use image::GenericImageView;
+use image::{DynamicImage, GenericImageView};
 
 use crate::colour::Colour;
 
@@ -12,7 +12,17 @@ pub(crate) struct Image {
 
 impl Image {
     pub fn load_from_file(image_path: &path::Path) -> Self {
-        let img = image::open(image_path).expect("Expected image to exist");
+        let img = if image_path
+            .extension()
+            .is_some_and(|extension| extension == OsStr::new("aseprite"))
+        {
+            let ase =
+                asefile::AsepriteFile::read_file(image_path).expect("failed to read aseprite file");
+            DynamicImage::ImageRgba8(ase.frame(0).image())
+        } else {
+            image::open(image_path).expect("Expected image to exist")
+        };
+
         Self::load_from_dyn_image(img)
     }
 
diff --git a/examples/hyperspace-roll/gfx/help-text.png b/examples/hyperspace-roll/gfx/help-text.png
deleted file mode 100644
index de6db475873f6bd474bf2594f17945669a4772ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp)
z=>Px%2}wjjRCt{2naz=dFbstSLkdV*NEPWPW#zKfq=mhthLpgb%y`6;WP@kCAbpqM
zKP)-IMvvikz09BYi-?Hsk0+(;ynKH=mpa~_*P-$GxV*pA#_RH5bWc97HYc)K^1}-g
zT6}8(v_DS@8dP5k4+vy83Y^prl_fvCF!HCCh*o8e)!u3hx(C`Rr1ly=&^mZvB+|ET
z#Fi(e#nV+{*B(DS2Ek;VtyWn&e=V#z@;bzpBSqRFw)$`ehTHWr_ckKv$JpC|pf3>s
z&KZf;XYJ?xTD@JTa=PYa-d7s0&B5C_QXk2tylnX?*=?=K(O()zF0`aF7j1a1k8=NX
zo&Taf`8``KAfHpRA&2|LfBCv_A4=vp0&oYgKu?mj5G{q47CJ;p@NMz)Xe>HF4YkT)
z>eF+(L^fJBdC&<aUct9HwC(N9nM<^NRF))OezcU}HSgzy4&a<f1Dz8A;GE(6`!f^S
zx_?QZl5hNcoOE4dgVtVRr#7y1%uzori(dnIS<(fNPJnV~DfgG&s<oWERGW~-SSg{V
zbF|hldb8*NS_E6cQKH&Ov|7kL_t5-B?Pmh&0M>W)k|3yAuojEE=N`5Go{5zXfI#PM
zttL?W&0Wj$x7blLzt(T7hVfqs9l$w}20AAKz&Q~B&WQkUP6U8+A^@Bd0pOen0Ov#i
dI41(YIe+FpSS2R9=LP@(002ovPDHLkV1k}Z5kmj~

diff --git a/examples/hyperspace-roll/gfx/stars.png b/examples/hyperspace-roll/gfx/stars.png
deleted file mode 100644
index 65062d6e6e384270b473f8237a277eb6ed5bfa69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$;7LS5RCt{2THBGrFbs4uLjlkNRnX6sML$$QE%4<T#%DRU-kNAX?~-V<mR7RE
zcDr6a<;2*n39RD%da^z*oB;R7AL>3xI936;SBDd=aFy#8!2{l}Cwk?Npjrah45=?a
zb3b$q^mkMSaIc8u3LnJ_Q38?(*9EwN7QnOPAK{mKmH_mRNGnX?3JS35%9X^3429_E
zUP=ea60jyvVO4UO0oDYpAtpeSE|Mjn9gwo4li=WDH%JAA&uK~k5@~NQ@(L<9C__$@
z0T6NyuqIGpReq@L@an<i46wUTDhCk{@YW_r_?H13sTk$uOX&zeA@8}3meS|PdL#yk
z=S7$vznlZC30T9`cL9r1$r7+8P>QWdiU_berLBDa=D_ek#LE=7$^*+gga=42N(ccY
z;lczhA+j0j!OJ+@f^{=Ag0|B`XydC-f+K-7#A)NJo1m9ATfuIEN2{pu@++AXstrnH
zPbdK-kaK|4gRR@$FGgIl1gr^g0+V$ve=aXEWI@<&*UQJ-aH5I5lr`n7&5b*LnxHiS
zYq*#L+G~6F&Rl~**94_aQNwg+V=Q@qhi<{mVXqHugY-ZR?BTZu-4mhqp_m{uFE{)7
oT+#!&CqmL5;GuLNoPG}Y0{t2n(s^v4>Hq)$07*qoM6N<$f*bwvDgXcg

diff --git a/examples/hyperspace-roll/gfx/title-screen.png b/examples/hyperspace-roll/gfx/title-screen.png
deleted file mode 100644
index cc2c524053ca82f69ada0fadcd047b966c891e12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4313
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
Hu0mjf+f6s3

diff --git a/examples/hyperspace-roll/src/background.rs b/examples/hyperspace-roll/src/background.rs
index 85609f85..61035ce1 100644
--- a/examples/hyperspace-roll/src/background.rs
+++ b/examples/hyperspace-roll/src/background.rs
@@ -6,9 +6,9 @@ use agb::{
 use crate::sfx::Sfx;
 
 include_background_gfx!(backgrounds, "121105",
-    stars => "gfx/stars.png",
-    title => "gfx/title-screen.png",
-    help => "gfx/help-text.png",
+    stars => "gfx/stars.aseprite",
+    title => "gfx/title-screen.aseprite",
+    help => "gfx/help-text.aseprite",
     descriptions1 => "gfx/descriptions1.png",
     descriptions2 => "gfx/descriptions2.png",
 );
diff --git a/examples/the-purple-night/gfx/background.png b/examples/the-purple-night/gfx/background.png
deleted file mode 100644
index 32786957942310769d0206c6cdb8932e1f730b00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2082
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
M07*qoM6N<$f+~LSjsO4v

diff --git a/examples/the-purple-night/gfx/boss.png b/examples/the-purple-night/gfx/boss.png
deleted file mode 100644
index b17c3a39247115e4bc9ede448886c6fa0ed14fa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3041
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

diff --git a/examples/the-purple-night/gfx/objects.png b/examples/the-purple-night/gfx/objects.png
deleted file mode 100644
index 167e3a2fd3dee271287d4ae2773e07a8fa0cc5ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9719
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
Z_4Ic*nao2Y@JlY>nUa<wOx`@`{{ct;)_MQ{

diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs
index 9be41653..cc861298 100644
--- a/examples/the-purple-night/src/lib.rs
+++ b/examples/the-purple-night/src/lib.rs
@@ -57,7 +57,7 @@ const SWORDLESS_JUMP: &Tag = TAG_MAP.get("jump swordless");
 const SWORDLESS_ATTACK: &Tag = KNIFE_ATTACK;
 const SWORDLESS_JUMP_ATTACK: &Tag = KNIFE_JUMP_ATTACK;
 
-agb::include_background_gfx!(background, "53269a", background => "gfx/background.png");
+agb::include_background_gfx!(background, "53269a", background => "gfx/background.aseprite");
 
 type Number = FixedNum<8>;
 

From 45343efe520a5cfe363e81d3758f59e4bf3285aa Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:33:59 +0100
Subject: [PATCH 09/14] Update lockfiles

---
 agb-gbafix/Cargo.lock                         | 152 ++++---------
 book/games/pong/Cargo.lock                    | 126 ++---------
 examples/combo/Cargo.lock                     | 120 ++---------
 examples/hyperspace-roll/Cargo.lock           | 126 ++---------
 .../the-hat-chooses-the-wizard/Cargo.lock     | 120 ++---------
 examples/the-purple-night/Cargo.lock          | 126 ++---------
 mgba-test-runner/Cargo.lock                   |  46 +++-
 tools/Cargo.lock                              | 203 ++++++++++++------
 8 files changed, 300 insertions(+), 719 deletions(-)

diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock
index 7bee57fa..a600b538 100644
--- a/agb-gbafix/Cargo.lock
+++ b/agb-gbafix/Cargo.lock
@@ -15,42 +15,51 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
 dependencies = [
  "anstyle",
  "anstyle-parse",
+ "anstyle-query",
  "anstyle-wincon",
- "concolor-override",
- "concolor-query",
+ "colorchoice",
  "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "0.3.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
-name = "anstyle-wincon"
-version = "0.2.0"
+name = "anstyle-query"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
 dependencies = [
  "anstyle",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -79,18 +88,18 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
 [[package]]
 name = "clap"
-version = "4.2.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
+checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.2.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -106,19 +115,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
 
 [[package]]
-name = "concolor-override"
+name = "colorchoice"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
-
-[[package]]
-name = "concolor-query"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
-dependencies = [
- "windows-sys 0.45.0",
-]
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "elf"
@@ -128,13 +128,13 @@ checksum = "e2b183d6ce6ca4cf30e3db37abf5b52568b5f9015c97d9fbdd7026aa5dcdd758"
 
 [[package]]
 name = "errno"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -170,7 +170,7 @@ checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -182,7 +182,7 @@ dependencies = [
  "hermit-abi",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -199,16 +199,16 @@ checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
 
 [[package]]
 name = "rustix"
-version = "0.37.8"
+version = "0.37.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aef160324be24d31a62147fae491c14d2204a3865c7ca8c3b0d7f7bcb3ea635"
+checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -223,37 +223,13 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -262,93 +238,51 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.0"
diff --git a/book/games/pong/Cargo.lock b/book/games/pong/Cargo.lock
index 5915f0ec..1597215a 100644
--- a/book/games/pong/Cargo.lock
+++ b/book/games/pong/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
  "agb_macros",
  "agb_sound_converter",
  "bare-metal",
- "bitflags 2.0.2",
+ "bitflags 2.1.0",
  "modular-bitfield",
  "rustc-hash",
 ]
@@ -44,9 +44,7 @@ dependencies = [
  "image",
  "proc-macro2",
  "quote",
- "serde",
- "syn 2.0.8",
- "toml",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -55,7 +53,7 @@ version = "0.14.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -65,7 +63,7 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -113,9 +111,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
+checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
 
 [[package]]
 name = "bytemuck"
@@ -176,15 +174,15 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
  "ttf-parser",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
  "libc",
@@ -200,12 +198,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hound"
 version = "3.5.0"
@@ -227,21 +219,11 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "log"
@@ -252,12 +234,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -371,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -393,35 +369,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "serde"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.8",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -441,49 +388,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.8"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "ttf-parser"
 version = "0.15.2"
@@ -507,12 +420,3 @@ name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winnow"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
-dependencies = [
- "memchr",
-]
diff --git a/examples/combo/Cargo.lock b/examples/combo/Cargo.lock
index 0d0332fc..ac40b044 100644
--- a/examples/combo/Cargo.lock
+++ b/examples/combo/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
  "agb_macros",
  "agb_sound_converter",
  "bare-metal",
- "bitflags 2.0.2",
+ "bitflags 2.1.0",
  "modular-bitfield",
  "rustc-hash",
 ]
@@ -44,9 +44,7 @@ dependencies = [
  "image",
  "proc-macro2",
  "quote",
- "serde",
- "syn 2.0.8",
- "toml",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -55,7 +53,7 @@ version = "0.14.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -65,7 +63,7 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -122,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
+checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
 
 [[package]]
 name = "bytemuck"
@@ -201,7 +199,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
  "ttf-parser",
 ]
 
@@ -216,9 +214,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -234,12 +232,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hound"
 version = "3.5.0"
@@ -268,16 +260,6 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -286,9 +268,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "libflate"
@@ -311,12 +293,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -423,9 +399,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -459,44 +435,35 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "serde"
-version = "1.0.158"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.158"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.94"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -516,9 +483,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.8"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -561,40 +528,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "ttf-parser"
 version = "0.15.2"
@@ -619,15 +552,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "winnow"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "xml-rs"
 version = "0.8.4"
diff --git a/examples/hyperspace-roll/Cargo.lock b/examples/hyperspace-roll/Cargo.lock
index b0461ff4..753b5b84 100644
--- a/examples/hyperspace-roll/Cargo.lock
+++ b/examples/hyperspace-roll/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
  "agb_macros",
  "agb_sound_converter",
  "bare-metal",
- "bitflags 2.0.2",
+ "bitflags 2.1.0",
  "modular-bitfield",
  "rustc-hash",
 ]
@@ -44,9 +44,7 @@ dependencies = [
  "image",
  "proc-macro2",
  "quote",
- "serde",
- "syn 2.0.8",
- "toml",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -55,7 +53,7 @@ version = "0.14.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -65,7 +63,7 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -113,9 +111,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
+checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
 
 [[package]]
 name = "bytemuck"
@@ -176,15 +174,15 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
  "ttf-parser",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
  "libc",
@@ -200,12 +198,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hound"
 version = "3.5.0"
@@ -234,21 +226,11 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "log"
@@ -259,12 +241,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -371,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -393,35 +369,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "serde"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.8",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -441,49 +388,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.8"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "ttf-parser"
 version = "0.15.2"
@@ -507,12 +420,3 @@ name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winnow"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
-dependencies = [
- "memchr",
-]
diff --git a/examples/the-hat-chooses-the-wizard/Cargo.lock b/examples/the-hat-chooses-the-wizard/Cargo.lock
index 3bdb1ec3..4de4793d 100644
--- a/examples/the-hat-chooses-the-wizard/Cargo.lock
+++ b/examples/the-hat-chooses-the-wizard/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
  "agb_macros",
  "agb_sound_converter",
  "bare-metal",
- "bitflags 2.0.2",
+ "bitflags 2.1.0",
  "modular-bitfield",
  "rustc-hash",
 ]
@@ -44,9 +44,7 @@ dependencies = [
  "image",
  "proc-macro2",
  "quote",
- "serde",
- "syn 2.0.8",
- "toml",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -55,7 +53,7 @@ version = "0.14.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -65,7 +63,7 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -113,9 +111,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
+checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
 
 [[package]]
 name = "bytemuck"
@@ -176,15 +174,15 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
  "ttf-parser",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
  "libc",
@@ -200,12 +198,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hound"
 version = "3.5.0"
@@ -227,16 +219,6 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -245,9 +227,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "log"
@@ -258,12 +240,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -370,9 +346,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -400,44 +376,35 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "serde"
-version = "1.0.158"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.158"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.94"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -457,9 +424,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.8"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -475,40 +442,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "ttf-parser"
 version = "0.15.2"
@@ -532,12 +465,3 @@ name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winnow"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
-dependencies = [
- "memchr",
-]
diff --git a/examples/the-purple-night/Cargo.lock b/examples/the-purple-night/Cargo.lock
index ac89ff17..8b6264da 100644
--- a/examples/the-purple-night/Cargo.lock
+++ b/examples/the-purple-night/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
  "agb_macros",
  "agb_sound_converter",
  "bare-metal",
- "bitflags 2.0.2",
+ "bitflags 2.1.0",
  "modular-bitfield",
  "rustc-hash",
 ]
@@ -44,9 +44,7 @@ dependencies = [
  "image",
  "proc-macro2",
  "quote",
- "serde",
- "syn 2.0.8",
- "toml",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -55,7 +53,7 @@ version = "0.14.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -65,7 +63,7 @@ dependencies = [
  "hound",
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -122,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
+checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
 
 [[package]]
 name = "bytemuck"
@@ -191,7 +189,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown",
  "ttf-parser",
 ]
 
@@ -206,9 +204,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -224,12 +222,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hound"
 version = "3.5.0"
@@ -251,21 +243,11 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "libflate"
@@ -288,12 +270,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -400,9 +376,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -428,35 +404,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "serde"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.158"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.8",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -476,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.8"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -512,40 +459,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "toml"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "ttf-parser"
 version = "0.15.2"
@@ -570,15 +483,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "winnow"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "xml-rs"
 version = "0.8.4"
diff --git a/mgba-test-runner/Cargo.lock b/mgba-test-runner/Cargo.lock
index bb4c6046..09bfcca0 100644
--- a/mgba-test-runner/Cargo.lock
+++ b/mgba-test-runner/Cargo.lock
@@ -77,6 +77,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "fdeflate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "flate2"
 version = "1.0.25"
@@ -84,14 +93,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
 ]
 
 [[package]]
 name = "image"
-version = "0.24.5"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -112,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "memchr"
@@ -141,6 +150,16 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -173,21 +192,22 @@ dependencies = [
 
 [[package]]
 name = "png"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
 dependencies = [
  "bitflags",
  "crc32fast",
+ "fdeflate",
  "flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.1",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.2"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -199,3 +219,9 @@ name = "regex-syntax"
 version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
diff --git a/tools/Cargo.lock b/tools/Cargo.lock
index 6c804fdc..ed67cdfc 100644
--- a/tools/Cargo.lock
+++ b/tools/Cargo.lock
@@ -11,6 +11,55 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -58,25 +107,31 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.13"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b"
+checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a"
 dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6"
+dependencies = [
+ "anstream",
+ "anstyle",
  "bitflags",
  "clap_lex",
- "is-terminal",
  "strsim",
- "termcolor",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.3.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
 
 [[package]]
 name = "codespan-reporting"
@@ -89,16 +144,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
+name = "colorchoice"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cxx"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -108,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -118,24 +179,24 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.8",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -149,13 +210,13 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.2.8"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -194,9 +255,9 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.54"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -218,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -228,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -239,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
  "hermit-abi",
  "io-lifetimes",
@@ -260,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "link-cplusplus"
@@ -275,9 +336,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
 
 [[package]]
 name = "log"
@@ -319,12 +380,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
-[[package]]
-name = "os_str_bytes"
-version = "6.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
-
 [[package]]
 name = "petgraph"
 version = "0.6.3"
@@ -337,9 +392,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -355,9 +410,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.11"
+version = "0.37.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e"
+checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
 dependencies = [
  "bitflags",
  "errno",
@@ -392,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.8"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -461,6 +516,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -554,27 +615,27 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.46.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -587,51 +648,51 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deac0939bd6e4f24ab5919fbf751c97a8cfc8543bb083a305ed5c0c10bb241d1"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
 dependencies = [
  "memchr",
 ]

From eb4476043c0fd6b5c730dd87c44420eec33d58e4 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:35:33 +0100
Subject: [PATCH 10/14] Add changelog entry

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c1024e1..eee11ee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- You can now import aseprite files directly (in addition to the already supported png and bmp files) when importing background tiles.
+
+### Changed
+- Importing background tiles has been improved. You no longer need to use `include_gfx!` with the toml file. Instead, use `include_background_gfx`. See the documentation for usage.
+
 ## [0.14.0] - 2023/04/11
 
 ### Added

From 293bb15c7bcc47f8a49ddb29545e83f895daec43 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Thu, 13 Apr 2023 22:46:03 +0100
Subject: [PATCH 11/14] Don't need this any more now I'm finished debugging

---
 agb/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/agb/src/lib.rs b/agb/src/lib.rs
index e4c37070..5379d0fe 100644
--- a/agb/src/lib.rs
+++ b/agb/src/lib.rs
@@ -13,7 +13,6 @@
 #![feature(alloc_error_handler)]
 #![feature(allocator_api)]
 #![feature(asm_const)]
-#![feature(trace_macros)]
 #![warn(clippy::all)]
 #![deny(clippy::must_use_candidate)]
 #![deny(clippy::trivially_copy_pass_by_ref)]

From bace62b8e30a3ddc698cfc5aacbe5c75919b7d88 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Fri, 14 Apr 2023 21:16:12 +0100
Subject: [PATCH 12/14] Don't use nightly only function

---
 agb-image-converter/src/image_loader.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/agb-image-converter/src/image_loader.rs b/agb-image-converter/src/image_loader.rs
index 81c8fff8..a7909ce0 100644
--- a/agb-image-converter/src/image_loader.rs
+++ b/agb-image-converter/src/image_loader.rs
@@ -12,10 +12,7 @@ pub(crate) struct Image {
 
 impl Image {
     pub fn load_from_file(image_path: &path::Path) -> Self {
-        let img = if image_path
-            .extension()
-            .is_some_and(|extension| extension == OsStr::new("aseprite"))
-        {
+        let img = if image_path.extension() == Some(OsStr::new("aseprite")) {
             let ase =
                 asefile::AsepriteFile::read_file(image_path).expect("failed to read aseprite file");
             DynamicImage::ImageRgba8(ase.frame(0).image())

From 6575a067b54c2d3edced8cad6ee9a2d7a1c80773 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Tue, 18 Apr 2023 20:07:08 +0100
Subject: [PATCH 13/14] Fix documentation compilation

---
 agb/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/agb/src/lib.rs b/agb/src/lib.rs
index 5379d0fe..72926375 100644
--- a/agb/src/lib.rs
+++ b/agb/src/lib.rs
@@ -71,10 +71,10 @@
 ///         tiled::{RegularBackgroundSize, TileFormat, TileSet, TileSetting, Tiled0, TiledMap, VRamManager},
 ///         Priority,
 ///     },
-///     include_gfx,
+///     include_background_gfx,
 /// };
 ///
-/// agb::include_background_gfx!(water_tiles, tiles => "exmaples/water_tiles.png");
+/// agb::include_background_gfx!(water_tiles, tiles => "examples/water_tiles.png");
 ///
 /// # fn load_tileset(mut gfx: Tiled0, mut vram: VRamManager) {
 /// let tileset = TileSet::new(water_tiles::tiles.tiles, TileFormat::FourBpp);

From 1e0102d6159d0085a78771a9d72e9b88ac3cdd68 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <gw@ilym.me>
Date: Tue, 18 Apr 2023 20:29:45 +0100
Subject: [PATCH 14/14] Also update the combo rom

---
 examples/combo/gfx/games.toml | 16 ----------------
 examples/combo/src/lib.rs     |  9 +++++++--
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 examples/combo/gfx/games.toml

diff --git a/examples/combo/gfx/games.toml b/examples/combo/gfx/games.toml
deleted file mode 100644
index 6fa1825c..00000000
--- a/examples/combo/gfx/games.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-version = "1.0"
-
-[image.hat]
-filename = "hat.png"
-tile_size = "8x8"
-transparent_colour = "121105"
-
-[image.purple]
-filename = "purple.png"
-tile_size = "8x8"
-transparent_colour = "121105"
-
-[image.hyperspace]
-filename = "hyperspace.png"
-tile_size = "8x8"
-transparent_colour = "121105"
diff --git a/examples/combo/src/lib.rs b/examples/combo/src/lib.rs
index 9d341eb1..0092078a 100644
--- a/examples/combo/src/lib.rs
+++ b/examples/combo/src/lib.rs
@@ -12,7 +12,7 @@ use agb::{
         Priority,
     },
     fixnum::{Num, Vector2D},
-    include_gfx,
+    include_background_gfx,
     input::Button,
 };
 
@@ -42,7 +42,12 @@ impl Game {
     }
 }
 
-include_gfx!("gfx/games.toml");
+include_background_gfx!(
+    games, "121105",
+    hat => "gfx/hat.png",
+    purple => "gfx/purple.png",
+    hyperspace => "gfx/hyperspace.png"
+);
 
 fn get_game(gba: &mut agb::Gba) -> Game {
     let mut input = agb::input::ButtonController::new();