From 3d7d3f25a2f7f500f0774a1bcc18b3d137854196 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <email@gwilym.dev>
Date: Tue, 29 Aug 2023 14:13:40 +0100
Subject: [PATCH] Update agb repo

---
 agb-image-converter/src/rust_generator.rs | 2 +-
 agb/examples/animated_background.rs       | 4 ++--
 agb/src/display/example_logo.rs           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/agb-image-converter/src/rust_generator.rs b/agb-image-converter/src/rust_generator.rs
index 3ea5da90..aad0b001 100644
--- a/agb-image-converter/src/rust_generator.rs
+++ b/agb-image-converter/src/rust_generator.rs
@@ -93,7 +93,7 @@ pub(crate) fn generate_code(
         let palette_assignment = assignments.get(data.new_index).unwrap_or(&0);
         let vflipped = data.transformation.vflip;
         let hflipped = data.transformation.hflip;
-        let index=  data.new_index as u16;
+        let index = data.new_index as u16;
 
         quote! {
             #crate_prefix::display::tiled::TileSetting::new(#index, #hflipped, #vflipped, #palette_assignment)
diff --git a/agb/examples/animated_background.rs b/agb/examples/animated_background.rs
index 31ef37b1..398932b7 100644
--- a/agb/examples/animated_background.rs
+++ b/agb/examples/animated_background.rs
@@ -3,7 +3,7 @@
 
 use agb::{
     display::{
-        tiled::{RegularBackgroundSize, TileFormat, TileSet, TileSetting, TiledMap},
+        tiled::{RegularBackgroundSize, TileFormat, TileSet, TiledMap},
         Priority,
     },
     include_background_gfx,
@@ -32,7 +32,7 @@ fn main(mut gba: agb::Gba) -> ! {
                 &mut vram,
                 (x, y).into(),
                 &tileset,
-                TileSetting::new(0, false, false, 0),
+                water_tiles::water_tiles.tile_settings[0],
             );
         }
     }
diff --git a/agb/src/display/example_logo.rs b/agb/src/display/example_logo.rs
index 240f6638..5c008a29 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, TiledMap, VRamManager};
 
-crate::include_background_gfx!(crate, agb_logo, test_logo => "gfx/test_logo.png");
+crate::include_background_gfx!(crate, agb_logo, test_logo => deduplicate "gfx/test_logo.png");
 
 pub fn display_logo(map: &mut RegularMap, vram: &mut VRamManager) {
     vram.set_background_palettes(agb_logo::PALETTES);