ensure conflated tilemaps output actual size in log

src/cmd/asm/command.rs

@@ -86,15 +86,15 @@ where
 			}
 		}
 		common::output_to_file(&file_name, output.as_bytes(), &asm_args.sd_image)?;
-		let size = v.size_in_bytes()?;
+		let size = v.size_in_bytes(conflate)?;
 		// Warn if we're getting close to t
 		info!("Resource {} has size {}", v.id(), size);
 		if size >= (LOW_RAM_SIZE as f64 * LOW_RAM_WARN_THRESHOLD) as usize
 			&& asm_args.format != AsmFormat::Bin
 		{
 			warn!("Resource {} has a size of {} bytes, which approaches or exceeds the size of Low RAM ({}) bytes. Consider outputting as .BIN instead.", v.id(), size, LOW_RAM_SIZE);
 		}
-		assembled_size += v.size_in_bytes()?;
+		assembled_size += v.size_in_bytes(conflate)?;
 	}
 	Ok(assembled_size)
 }

vera/src/asm.rs

@@ -29,7 +29,7 @@ pub trait Assemblable {
 	fn id(&self) -> &str;
 
 	/// Size, in bytes, of assembled asset
-	fn size_in_bytes(&self) -> Result<usize, Error>;
+	fn size_in_bytes(&self, conflated_size: bool) -> Result<usize, Error>;
 }
 
 /// Enum for variations ToAsm implementors can assemble to

vera/src/bitmap.rs

@@ -109,7 +109,7 @@ impl<'a> Assemblable for VeraBitmap<'a> {
 		&self.id
 	}
 
-	fn size_in_bytes(&self) -> Result<usize, Error> {
+	fn size_in_bytes(&self, _conflated: bool) -> Result<usize, Error> {
 		match self.imageset {
 			Some(i) => Ok(i.size()),
 			None => Err(ErrorKind::BitmapNoImageSet(format!("{}", self.id)).into()),

vera/src/imageset.rs

@@ -503,7 +503,7 @@ impl Assemblable for VeraImageSet {
 		&self.id
 	}
 
-	fn size_in_bytes(&self) -> Result<usize, Error> {
+	fn size_in_bytes(&self, _conflated: bool) -> Result<usize, Error> {
 		Ok(self.size())
 	}
 

vera/src/palette.rs

@@ -291,7 +291,7 @@ impl Assemblable for VeraPalette {
 		&self.id
 	}
 
-	fn size_in_bytes(&self) -> Result<usize, Error> {
+	fn size_in_bytes(&self, _conflated: bool) -> Result<usize, Error> {
 		Ok(self.size())
 	}
 

vera/src/sprite.rs

@@ -122,7 +122,7 @@ impl<'a> Assemblable for VeraSprite<'a> {
 		&self.id
 	}
 
-	fn size_in_bytes(&self) -> Result<usize, Error> {
+	fn size_in_bytes(&self, _conflated: bool) -> Result<usize, Error> {
 		match self.imageset {
 			Some(i) => Ok(i.size()),
 			None => Err(ErrorKind::SpriteNoImageSet(format!("{}", self.id)).into()),

vera/src/tilemap.rs

@@ -102,7 +102,7 @@ impl Assemblable for VeraTileMapEntry {
 		"0"
 	}
 
-	fn size_in_bytes(&self) -> Result<usize, Error> {
+	fn size_in_bytes(&self, _conflated: bool) -> Result<usize, Error> {
 		Ok(2)
 	}
 
@@ -480,8 +480,12 @@ impl Assemblable for VeraTileMap {
 		&self.id
 	}
 
-	fn size_in_bytes(&self) -> Result<usize, Error> {
-		Ok(self.size())
+	fn size_in_bytes(&self, conflated: bool) -> Result<usize, Error> {
+		if !conflated {
+			Ok(self.size())
+		} else {
+			Ok(self.map_width.val_as_u32() as usize * self.map_height.val_as_u32() as usize * 2)
+		}
 	}
 
 	fn assemble(&self) -> Result<AssembledPrimitive, Error> {