More map tests

Author: funmaker

p8rs-tests/carts/gfx/map/basic.p8

@@ -24,6 +24,73 @@ map(4, 4, 112, 112, 4, 4)
 map(4, 0, 112, -16, 4, 4)
 p8rs.test_scr("clipping");
 
+cls()
+map()
+p8rs.test_scr("no args");
+
+cls()
+map(8)
+p8rs.test_scr("one arg");
+
+cls()
+map(4, 2)
+p8rs.test_scr("two arg");
+
+cls()
+map(4, 4, 16)
+map(0, 4, 30, 30)
+map(0, 0, 40, 40, 4)
+map(0, 0, 50, 50, 8, 8)
+p8rs.test_scr("less args");
+
+cls()
+camera(-63, -65)
+map(0, 0, -56, -56, 4, 4)
+map(0, 4, -56, 24, 4, 4)
+map(4, 4, 24, 24, 4, 4)
+map(4, 0, 24, -56, 4, 4)
+map(8, 8, -56, -20, 14, 5)
+camera()
+p8rs.test_scr("camera");
+
+cls()
+clip(26, 34, 68, 60)
+camera(-63, -65)
+map(0, 0, -56, -56, 4, 4)
+map(0, 4, -56, 24, 4, 4)
+map(4, 4, 24, 24, 4, 4)
+map(4, 0, 24, -56, 4, 4)
+map(8, 8, -56, -20, 14, 5)
+camera()
+clip()
+p8rs.test_scr("clip");
+
+cls()
+pal(4, 0x23)
+pal(2, 0x34)
+pal(4, 0x53, 2)
+pal(5, 0x48, 2)
+palt(4, false)
+fillp(0b0011001111001100.000)
+map(0, 0, 24, 48, 2, 2)
+fillp(0b0011001111001100.001)
+map(2, 0, 48, 48, 2, 2)
+fillp(0b0011001111001100.010)
+map(4, 0, 72, 48, 2, 2)
+fillp(0b0011001111001100.011)
+map(8, 0, 96, 48, 2, 2)
+fillp(0b0011001111001100.100)
+map(0, 2, 24, 72, 2, 2)
+fillp(0b0011001111001100.101)
+map(2, 2, 48, 72, 2, 2)
+fillp(0b0011001111001100.110)
+map(4, 2, 72, 72, 2, 2)
+fillp(0b0011001111001100.111)
+map(8, 2, 96, 72, 2, 2)
+fillp()
+p8rs.test_scr("pattern flags");
+
+
 local layers = { 0, 1, 2, 4, 8, 16, 32, 64, 128, 0b01010101, 0b10101010, 0b00110011, 0b00001111, 0b11111111 }
 for _, l in ipairs(layers) do
   cls()

p8rs-tests/carts/gfx/map/width.p8

@@ -12,7 +12,7 @@ function test(width, base)
   map(-2,  height - 6,  0, 64, 8, 8)
   map(width - 6, height - 6, 64, 64, 8, 8)
   map(width - 6, -2, 64,  0, 8, 8)
-  p8rs.test_scr(width .. "x" .. height)
+  p8rs.test_scr(width .. "X" .. height)
 end
 
 for width = 0x01,0xff do

p8rs-tests/carts/gfx/map/width_ex.p8

@@ -12,7 +12,7 @@ function test(width, base)
   map(-2,  height - 6,  0, 64, 8, 8)
   map(width - 6, height - 6, 64, 64, 8, 8)
   map(width - 6, -2, 64,  0, 8, 8)
-  p8rs.test_scr(width .. "x" .. height)
+  p8rs.test_scr(width .. "X" .. height)
 end
 
 for width = 0x01,0xff do

p8rs-tests/carts/gfx/rect.p8

@@ -94,4 +94,4 @@ rect(0, 80, 64, 96, 80, 4)
 fillp(0b0011001111001100.111)
 rect(0, 64, 64, 80, 80, 4)
 fillp()
-p8rs.test_scr("Pattern flags");
+p8rs.test_scr("pattern flags");

p8rs/src/vm/memory/mod.rs

@@ -32,6 +32,7 @@ impl Memory {
 
 	pub fn sprites(&mut self) -> Sprites<'_> {
 		// TODO: Handle map conflicts
+		// TODO: https://www.lexaloffle.com/bbs/?tid=50158 ?
 		let base_addr = match self.machine_state().sprite_addr_map().get() {
 			0x00 => 0x0000,
 			0x60 => 0x6000,
@@ -67,6 +68,25 @@ impl Memory {
 		}
 	}
 
+	pub fn screen(&mut self) -> Screen<'_> {
+		// TODO: Handle map conflicts
+		let base_addr = match self.machine_state().screen_addr_map().get() {
+			0x00 => 0x0000,
+			0x60 => 0x6000,
+			0x80 => 0x8000,
+			0xa0 => 0xa000,
+			0xc0 => 0xc000,
+			0xe0 => 0xe000,
+			_    => 0x0000,
+		};
+		
+		Screen(self.const_slice(base_addr))
+	}
+	
+	pub fn painter(&mut self) -> Painter<'_> {
+		Painter::new(self)
+	}
+	
 	pub fn sprite_flags(&mut self) -> SpriteFlags<'_> {
 		SpriteFlags(self.const_slice(0x3000))
 	}
@@ -91,25 +111,6 @@ impl Memory {
 		self.const_slice(0x5f80)
 	}
 
-	pub fn screen(&mut self) -> Screen<'_> {
-		// TODO: Handle map conflicts
-		let base_addr = match self.machine_state().screen_addr_map().get() {
-			0x00 => 0x0000,
-			0x60 => 0x6000,
-			0x80 => 0x8000,
-			0xa0 => 0xa000,
-			0xc0 => 0xc000,
-			0xe0 => 0xe000,
-			_    => 0x0000,
-		};
-		
-		Screen(self.const_slice(base_addr))
-	}
-	
-	pub fn painter(&mut self) -> Painter<'_> {
-		Painter::new(self)
-	}
-	
 	#[inline(always)]
 	pub(crate) fn const_slice<const S: usize>(&mut self, base: u16) -> &mut [u8; S] {
 		(&mut self.0[base as usize..base as usize + S]).try_into().unwrap()