Dynamic sprites use in memory buffers

agb-image-converter/src/sprite/multi.rs

@@ -175,7 +175,7 @@ impl ToTokens for Output {
             let y = sprite.size.1 as usize;
 
             quote! {
-                unsafe { Sprite::new_multi(&PALETTE, align_bytes!(u16, #data), Size::from_width_height(#x, #y)) }
+                unsafe { Sprite::new_multi(&PALETTE, align_bytes!(u32, #data), Size::from_width_height(#x, #y)) }
             }
         });
 
@@ -202,8 +202,6 @@ impl ToTokens for Output {
             }
         });
 
-        let start = (16 - self.palette.len() / 16) as u32;
-
         let input_files = self.input_files.iter().map(|file| {
             quote! {
                 const _: &[u8] = include_bytes!(#file);
@@ -213,7 +211,7 @@ impl ToTokens for Output {
         tokens.extend(quote! {
             #(#input_files)*
 
-            static PALETTE: PaletteMulti = PaletteMulti::new(#start, &[#(#palettes),*] );
+            static PALETTE: PaletteMulti = PaletteMulti::new(&[#(#palettes),*] );
             static SPRITES: &[Sprite] = &[#(#sprites),*];
 
             #(#tags)*

agb-image-converter/src/sprite/regular.rs

@@ -145,7 +145,7 @@ impl ToTokens for Output {
             let palette_idx = sprite.palette as usize;
 
             quote! {
-                unsafe { Sprite::new(&PALETTES[#palette_idx], align_bytes!(u16, #data), Size::from_width_height(#x, #y)) }
+                unsafe { Sprite::new(&PALETTES[#palette_idx], align_bytes!(u32, #data), Size::from_width_height(#x, #y)) }
             }
         });
 

agb/src/display/font/object.rs

@@ -74,7 +74,7 @@ impl ObjectTextRenderer {
         let pal_index = group.palette_index();
 
         for pixel in group.pixels() {
-            sprite.set_pixel(pixel.x as usize, pixel.y as usize, pal_index as usize);
+            sprite.set_pixel(pixel.x as usize, pixel.y as usize, pal_index);
         }
 
         let mut object = Object::new(sprite.to_vram(self.palette.clone()));

agb/src/display/object/sprites.rs

@@ -2,7 +2,7 @@ mod sprite;
 mod sprite_allocator;
 
 const BYTES_PER_TILE_4BPP: usize = 32;
-const BYTES_PER_TILE_8BPP: usize = 16;
+const BYTES_PER_TILE_8BPP: usize = 64;
 
 pub use sprite::{PaletteMulti, Size, Sprite, Tag, include_aseprite};
 pub use sprite_allocator::{

agb/src/display/object/sprites/sprite.rs

@@ -32,13 +32,12 @@ pub struct PaletteMulti {
 impl PaletteMulti {
     #[must_use]
     /// Create a new palette. The first index is the index where the palette starts.
-    pub const fn new(first_index: u32, palettes: &'static [Palette16]) -> Self {
+    pub const fn new(palettes: &'static [Palette16]) -> Self {
         assert!(palettes.len() <= 16);
         assert!(!palettes.is_empty());
-        assert!(16 - palettes.len() >= first_index as usize);
 
         Self {
-            first_index,
+            first_index: (16 - palettes.len()) as u32,
             palettes,
         }
     }
@@ -54,6 +53,12 @@ impl PaletteMulti {
     pub const fn first_index(&self) -> u32 {
         self.first_index
     }
+
+    #[must_use]
+    /// Gets the first colour from this palette
+    pub const fn first_colour_index(&self) -> u8 {
+        (self.first_index * 16) as u8
+    }
 }
 
 impl Sprite {

agb/src/display/object/sprites/sprite_allocator.rs

@@ -178,6 +178,12 @@ impl TryFrom<PaletteVram> for PaletteVramSingle {
     }
 }
 
+impl From<&'static PaletteMulti> for PaletteVramMulti {
+    fn from(value: &'static PaletteMulti) -> Self {
+        PaletteVramMulti::new(value)
+    }
+}
+
 impl TryFrom<PaletteVram> for PaletteVramMulti {
     type Error = PaletteVram;