Implemented total sprite flipping in bliting

commit `9737391`

neauoire · 2023-08-04 18:40:24 +0000 UTC

parent c12f2bf

Implemented total sprite flipping in bliting

4 files changed, +489, -15

M build.sh

A etc/pict.tal

M src/devices/screen.c

M src/uxn11.c

M build.sh

+3, -2

 1@@ -46,6 +46,7 @@ fi
 2 
 3 if [ "${1}" = '--norun' ]; then exit; fi
 4 
 5-bin/uxnasm etc/mouse.tal bin/mouse.rom
 6-bin/uxn11 bin/mouse.rom
 7+# bin/uxnasm etc/mouse.tal bin/res.rom
 8+bin/uxnasm etc/pict.tal bin/res.rom
 9+bin/uxn11 bin/res.rom
10

A etc/pict.tal

+473, -0

  1@@ -0,0 +1,473 @@
  2+( GUI Picture )
  3+
  4+|00 @System &vector $2 &wst $1 &rst $1 &eaddr $2 &ecode $1 &pad $1 &r $2 &g $2 &b $2 &debug $1 &halt $1
  5+|20 @Screen &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1
  6+
  7+|0100
  8+
  9+	( theme )
 10+	#f0f5 .System/r DEO2
 11+	#f00c .System/g DEO2
 12+	#f00a .System/b DEO2
 13+
 14+	( #0010
 15+		DUP2 .Screen/x DEO2
 16+		.Screen/y DEO2
 17+	;akane20x10 #20 #10 #01 draw-icn )
 18+
 19+	.Screen/width DEI2 #01 SFT2 .Screen/x DEO2
 20+	.Screen/height DEI2 #01 SFT2 .Screen/y DEO2
 21+	#1010 ;dafu10x10 #05 draw-fast
 22+
 23+	.Screen/width DEI2 #01 SFT2 .Screen/x DEO2
 24+	.Screen/height DEI2 #01 SFT2 .Screen/y DEO2
 25+	#1010 ;dafu10x10 #1a draw-fast
 26+
 27+	.Screen/width DEI2 #01 SFT2 .Screen/x DEO2
 28+	.Screen/height DEI2 #01 SFT2 .Screen/y DEO2
 29+	#1010 ;dafu10x10 #2f draw-fast
 30+
 31+	.Screen/width DEI2 #01 SFT2 .Screen/x DEO2
 32+	.Screen/height DEI2 #01 SFT2 .Screen/y DEO2
 33+	#1010 ;dafu10x10 #3b draw-fast
 34+
 35+	
 36+
 37+	( .Screen/width DEI2 #01 SFT2 .Screen/x DEO2
 38+	.Screen/height DEI2 #01 SFT2 .Screen/y DEO2
 39+	#1010 ;dafu10x10 #3f draw-fast
 40+
 41+	.Screen/width DEI2 #01 SFT2 .Screen/x DEO2
 42+	.Screen/height DEI2 #01 SFT2 .Screen/y DEO2
 43+	#1010 ;dafu10x10 #3f draw-fast )
 44+
 45+	
 46+
 47+BRK
 48+
 49+@draw-icn ( addr* width height color -- )
 50+
 51+	#05 .Screen/auto DEO
 52+	,&color STR
 53+	,&height STR
 54+	,&width STR
 55+	.Screen/addr DEO2
 56+	.Screen/x DEI2
 57+	,&x STR2
 58+	[ LIT2 00 &height $1 ] SUB
 59+	&ver
 60+		[ LIT2 &x $2 ] .Screen/x DEO2
 61+		[ LIT2 00 &width $1 ] SUB
 62+		&hor
 63+			[ LIT &color $1 ] .Screen/sprite DEO
 64+			INC DUP ?&hor
 65+		POP
 66+		.Screen/y DEI2k #0008 ADD2 ROT DEO2
 67+		INC DUP ?&ver
 68+	POP
 69+	#00 .Screen/auto DEO
 70+
 71+JMP2r
 72+
 73+( makes use of the auto byte )
 74+
 75+@draw-fast ( w h addr* color -- )
 76+
 77+	,&color STR
 78+	.Screen/addr DEO2
 79+	SWP #01 SUB #40 SFT #06 ORA .Screen/auto DEO
 80+	#00 SWP SUB
 81+	&loop
 82+		[ LIT2 &color $1 -Screen/sprite ] DEO
 83+		INC DUP ?&loop
 84+	POP
 85+
 86+JMP2r
 87+
 88+@akane20x10
 89+	0000 0000 0000 0000 2b41 2341 2b41 2341
 90+	8881 8081 8880 8080 0a00 2000 8800 2000
 91+	8004 2004 8804 2a04 0000 0000 8000 0000
 92+	0307 0f0f 0f1f 1f5f ffff ffff ffff ffff
 93+	ffff ffff ffff ffff ffff ffff ffff ffff
 94+	ffff ffff ffff ffff ffff ffff ffff ffff
 95+	ffff ffff ffff ffff ffff ffff ffff ffff
 96+	ffff ffff ffff ffff ffff fff7 ffff efdf
 97+	fbf7 efd7 efdf af5f fffd fbfd fbf5 ebd7
 98+	eaf5 ead5 ead5 aa55 ab55 ab55 ab57 ab57
 99+	fbf7 ebd7 ebd7 ab57 ffff ffff ffff fbf7
100+	ffff ffff ffff ffff ffff ffff ffff ffff
101+	ffff ffff ffff ffff ffff ffff ffff fefc
102+	80c0 8000 0000 0000 0000 0000 0000 0000
103+	0000 0000 0000 0000 2a54 2a54 2a54 2a54
104+	8800 2200 8800 2200 8800 2200 8800 2200
105+	0000 0000 0000 0000 2b41 2341 2b41 2341
106+	8880 8080 8880 a080 8800 2000 8800 2000
107+	8a05 2a05 8f0f 2a15 aa55 aafd ffff aa45
108+	bf7f ff7f ffff ffff ffff ffff ffff ffff
109+	ffff ffff ffff ffff ffff ffff ffff ffff
110+	ffff ffff ffff ffff ffff ffff ffff ffff
111+	ffff ffff ffff fefd ffff ffff ffff be7c
112+	ffff ffff 8a00 0200 befd fafd fe1f 2307
113+	bf5f bf7d bad5 eaf5 ead5 aa55 aa55 aa55
114+	aa55 aa55 aa55 aa55 aa55 aa55 aa55 ab57
115+	af57 af7f ffc5 a307 fbf7 ff9f 1f1f 8f9f
116+	ffff ffff ffff ffff ffff ffff ffff ffff
117+	ffff ffff ffff ffff fefd faf5 eaff ff5f
118+	0055 aa55 aaff ffff 0055 aa55 aaff ffff
119+	0055 aadf aaff ffff aa55 aad5 aaff ffff
120+	8840 aa77 aaff ffff 8800 aaff aaff ffff
121+	0000 0000 0000 0000 2b41 2341 2b41 2241
122+	8800 a000 8800 a004 8804 2004 8000 2240
123+	8810 0810 a010 2010 0200 0000 0000 0000
124+	bf3f 3f1f 0f07 0303 ffff ffff ffff ffff
125+	ffff ffff ffff ffff ffff ffff ffff ffff
126+	ffff ffff ffff ffff ffff ffff ffd7 ab55
127+	faf5 faf5 eaf5 eaf5 f870 e240 8840 8240
128+	8800 2200 8841 233f 8f1f 3f7f ffff ffff
129+	fadd eac1 e2c1 c2c1 aa55 aa55 aa55 aa55
130+	aa55 aa55 aa54 a040 ae54 a854 a855 2f07
131+	8f1f 1f3f bfff ffff 8f87 8f85 8205 2a05
132+	ffdf af5f bf7f bf77 ffff ffff ffff ffff
133+	fefd f8c0 80c0 80c0 aa55 2a15 0a15 0a15
134+	ab55 8000 8000 8000 fe55 0200 0800 2200
135+	aa55 2200 8800 2200 eb77 2a54 2a54 2a54
136+	ff55 2000 8800 2000 ff55 0000 0000 2000
137+	0000 0000 0000 0000 2a41 2241 2b41 2341
138+	8804 a004 8004 a004 0840 aa40 8850 8210
139+	a010 2040 a040 2040 0000 0000 0000 0000
140+	0301 0000 0000 0000 ffff ff7f 7f3f 3b07
141+	ffff ffff ffff ffff ffff ffff ffff ffff
142+	feff fefd fefd fefd aa55 aa55 aa55 aa55
143+	eaf5 fafd fafd fefd 8840 a250 a854 aa54
144+	bf1f 2f07 8800 8055 ffff fefc e800 0a54
145+	8201 2000 8000 8010 aa54 2800 0000 0000
146+	0000 0000 0000 0000 0301 0000 0000 0200
147+	fefc fa70 8801 aa50 8a05 0a05 0201 0303
148+	ef57 af5f af5f bf7f ffff ffff ffff ffff
149+	c0c0 a2c0 8880 a280 0a15 0a15 8a15 0a15
150+	0000 0000 8000 2000 0800 0200 0800 2000
151+	0800 2200 8800 0000 2a54 2a55 2a55 2a57
152+	8800 2000 a0ff ffff 8000 2000 a8ff ffff
153+	0000 0000 0000 0001 ab41 a341 ab5f ffff
154+	8004 a804 8eff ffff 8010 a200 a0c0 e2c1
155+	8040 80c0 80c0 8000 0000 0000 0000 0000
156+	0000 0000 0000 0000 0301 0101 0000 0000
157+	ffff ffff ff7f 1f0f ffff ffff ffff ffff
158+	fefd feff feff ffff aa55 aa55 aa55 aad5
159+	feff feff fe7f fe7f aa54 aa55 aa55 aa54
160+	0000 0000 0000 0000 0000 0000 0000 0000
161+	0800 0000 0000 0000 0000 0000 0000 0000
162+	0000 0001 0205 0a05 8040 2040 e070 e040
163+	0000 0000 0000 0000 0307 0307 0707 0f07
164+	ffff ffff ffff ffff ffff fefc fefc fcfc
165+	8207 3f7f 7f7f 7f7f 8aff ffff ffff ffff
166+	08c0 faf8 fcfc feff 8800 2000 8800 2000
167+	0000 2000 0000 0000 2b57 2f57 2b55 2a54
168+	ffff ffff ffff ffff ffff ffff ffff ffff
169+	0b03 0307 0707 0f1f ffff ffff ffff ffff
170+	ffff ffff ffff ffff e0f1 f9f1 faf3 faf7
171+	8000 0000 0000 0000 0000 0000 0000 0000
172+	0000 0000 0000 0000 0000 0000 0000 0000
173+	0707 0301 0000 0000 ffff ffff ff7f 3f1f
174+	ffff ffff ffff ffff eaf5 fafd feff ffff
175+	fe7d be7f be7d ffff aa54 aa54 aa54 aad5
176+	0000 0000 0000 0000 0000 0000 0000 0000
177+	0000 0000 0000 0000 0000 0000 0000 0000
178+	0201 0000 0000 0001 e040 0000 0000 0040
179+	0000 0000 0000 0000 0f07 0f07 0f0f 0f1f
180+	ffff ffff fffe fcfc f8f0 c280 0800 2200
181+	be7f 3e15 8a01 2205 ff5f af55 ab55 ab55
182+	feff ffff ffff bf7f 8000 2000 8800 a201
183+	8800 2000 0000 00f7 2854 2854 2854 28f4
184+	ff7f bf57 af5f 2f57 ffff ffff ffff ffff
185+	0f1f 0f07 0707 0707 ffff ffff ffff ffff
186+	ffff ffff fefd faf5 e2c4 8604 8844 a854
187+	0000 0000 0000 0000 0000 0000 0000 0000
188+	0000 0000 0000 0000 0000 0000 0000 0000
189+	0000 0000 0000 0000 0f03 0100 0000 0000
190+	ffff ff7f 0f07 0a05 ffff ffff ffff ff7f
191+	ffff ffff ffff ffff eaf5 fafd feff ffff
192+	8000 8040 a0d0 e8d4 0000 0000 0000 0000
193+	0000 0000 0000 0000 0000 0000 0000 0000
194+	0200 0000 0000 0000 8000 0000 0000 0000
195+	0000 0000 0001 0305 0f1f 3f7c f8f0 8201
196+	e8c4 2a11 a840 a200 8800 2200 2005 2000
197+	8215 2e57 2a55 aa55 aa55 aa55 aa55 3a15
198+	fe7c f8f0 e840 a250 0307 2f1f 8f1f 2f0f
199+	ffff ffff ffff ffff f8fc fefc feff fef0
200+	ab57 2b15 0a55 0a01 ffff feff ea55 8040
201+	0301 0005 aa10 0805 ffff ff5f aa05 2000
202+	eaf5 ead5 aa55 aa41 8810 b810 2070 2040
203+	0000 0000 0000 0000 0000 0000 0000 0000
204+	0000 0000 0000 0000 0000 0000 0204 0a10
205+	0000 0000 a805 2200 0000 0000 0040 2805
206+	0a05 0a10 2a41 a200 af57 a840 8844 0a10
207+	ffff ff7f 8f01 2004 ffff ffff ffff ff7f
208+	aed5 aad5 aad5 aad5 80c0 a85d ab55 aa55
209+	0000 0000 a054 aa55 0000 0000 0000 a055
210+	0000 0000 0000 0045 0000 0071 fa7c faf0
211+	0810 a240 0800 2001 0a04 0254 a850 8200
212+	0800 2200 8800 2200 8800 2200 8804 2a00
213+	8a05 2201 8a01 2001 a8d0 a0c4 8a54 a040
214+	2801 2000 8800 0250 8f01 8240 a011 2211
215+	af55 a040 8051 a815 e0c0 c240 8800 a200
216+	0840 2200 aa10 2214 2a05 2000 8800 2200
217+	8a00 2000 8000 2200 2a00 2200 8800 2200
218+	a214 2301 8000 2210 e040 80c0 6070 2010
219+	0000 0000 0000 0000 0000 0000 0000 0000
220+	0000 0001 0204 0814 2840 a200 8800 2200
221+	8800 2200 8800 2200 8b10 2240 0800 a200
222+	a855 2200 8800 2200 2040 a240 a810 2a04
223+	8810 2200 0845 a800 bf7f 3a11 3805 2301
224+	aa55 aa55 aa55 aa55 aa55 aa55 aa55 aa55
225+	aa55 aa55 aa55 aa55 aa55 aa55 aa75 fa7f
226+	ef75 bb5d bb5f bb5f f8f8 fafc f8fc fcfc
227+	8800 2201 8801 2201 0800 2200 0801 2204
228+	8800 2200 0850 2800 8010 0240 a810 2210
229+	8a01 2000 8800 2200 0800 a200 8800 2240
230+	a840 2200 a800 2200 8801 2a04 8805 2204
231+	8add aa45 8a14 2015 8800 a200 8800 a280
232+	8804 2804 8004 2204 8800 2200 8800 2200
233+	8800 0200 8840 0240 8800 2200 8800 2001
234+	8800 0240 8800 2200 b010 1810 b810 1810
235+	0000 0000 0000 0000 0000 0000 0000 0001
236+	0810 2240 8800 a200 8800 2200 8800 2201
237+	8801 2241 8a00 a204 8800 2200 8800 2200
238+	8800 2200 8800 2200 8a00 2201 8800 2200
239+	8a01 2200 0800 a200 0a05 aa75 aa05 2201
240+	aa55 aa55 aa55 aa55 aa55 aa55 aa55 aa55
241+	aa55 aa55 aa55 aa55 bf7f bf5f af47 8301
242+	bbd7 fbf1 f8fd feff fefc fefc fefe fefe
243+	8801 2241 2a05 2200 0040 8200 8800 0200
244+	0000 a204 a840 2200 0a50 8200 8800 2200
245+	a010 2200 8801 2200 8800 2200 2800 a240
246+	a800 2205 8205 2205 8a04 2254 a855 ab55
247+	3e15 2a75 ead5 aa55 82d5 ea75 aa75 aa75
248+	a85c aa50 a850 aa50 8800 2200 8800 2200
249+	0800 a200 8800 a200 8a01 2000 8801 2001
250+	0800 2200 8800 2200 8810 2810 8814 2804
251+	0000 0000 0000 0000 0204 0004 0810 0210
252+	8800 2200 8800 2200 8801 2001 8801 2200
253+	0804 2a00 0810 a200 8800 2200 8800 2200
254+	8800 2200 8800 2200 8800 2200 8801 2200
255+	0840 0240 a800 a210 8800 2200 8800 2200
256+	2a14 2200 8800 2200 aa00 8040 a804 2200
257+	a800 0000 0000 8050 0000 0000 0000 0001
258+	ff7f 3f1f 3f71 8200 feff feff ffff ff7f
259+	8800 2200 88f0 fafc a804 2200 aa11 0210
260+	8800 2200 0800 a200 8800 2200 8800 2200
261+	8800 2200 8800 2200 0840 2240 a800 221f
262+	8a01 2205 8205 befd a850 a854 a855 a955
263+	ff7f ffdd badd ba5d eaf5 ea75 ea75 ead5
264+	a850 aa50 a850 a250 8800 2a04 8a00 2200
265+	0800 0250 0800 0254 8011 2200 8800 2201
266+	0800 2055 aa55 aad5 8810 2040 a040 a040
267+	0000 0000 0000 0200 2800 2240 0840 0240
268+	8800 2200 8800 2200 8800 2200 8800 2200
269+	8800 2200 8800 2200 8800 2200 8800 2200
270+	8800 2200 8800 2200 8800 2200 8800 2200
271+	0850 2210 881c 2804 8800 2200 8800 2200
272+	8800 2200 8800 2200 8800 2200 8800 2200
273+	8a05 2200 8004 0f1f 0244 a818 9810 b2f0
274+	8800 2200 8800 2200 bf1f 2f1f 8f0f 2f07
275+	feff ffff ffff ffff 0090 e2f0 e0f0 f8fc
276+	8840 2200 a800 2210 8800 2200 8800 2200
277+	8800 2200 8800 2200 9f1f 2f0f 8f07 2305
278+	fefd fefd fefd fefd ab51 aa57 aa57 ae55
279+	ba5d ba55 aa55 aa55 ead5 ead5 aad5 aad5
280+	a857 bf7f ff7f ffff afff ffff ffff ffff
281+	80f5 ffff ffff ffff 8855 faf0 f8f8 f8fd
282+	aad5 aa55 2a55 2a55 a075 aa40 a040 a055
283+	0850 aa01 0201 0055 0840 8240 2800 2270
284+	8800 2200 8800 2200 8800 2200 8800 2200
285+	8800 2200 8800 2200 8800 2200 8800 2200
286+	8800 2200 8800 2200 8800 2200 8800 2200
287+	8a01 2001 8800 2200 8800 a2c0 a850 2834
288+	8800 2200 8800 2200 8800 2200 8800 2200
289+	bf7f ff7f ff7f 7f7f e8f0 e2f0 f0f0 fafc
290+	8800 2200 8800 2200 8f0f 2f1f 9f1f 3f7f
291+	ffff ffff fffd fefd fcfd fef5 aa55 ab57
292+	0050 e0f1 fafd eed5 0874 ae57 af5f be5d
293+	8800 22c0 b85c aa5c 8a04 2200 8800 2200
294+	fe7d 3e3d be1d 2e05 ae55 ae55 ae7d ee5d
295+	ab55 ab55 ab57 aa57 aa55 ab55 ab57 ab57
296+	ffff ffff ffff ffff ffff ffff ffff ffff
297+	ffff ffff ffff ffff ffff ffff ffff fefc
298+	ead5 eaf5 eaf5 aa15 bf5f bf5f bf5d aa51
299+	feff ffff ff75 aa40 e8f0 eae4 e064 a210
300+	8800 2200 8800 2200 8800 2200 8800 2200
301+	8800 2200 8800 2200 8800 2200 8800 2201
302+	8800 2005 8810 2200 8800 8200 8800 2200
303+	8800 2200 8800 2200 ba14 2a05 8607 2301
304+	0800 2210 0804 a200 8800 2201 8a04 2850
305+	7f7f ff7f 3f1f 3f1f fcfe ffff ffff f8fc
306+	8801 8fff ffff fe7d ffff ffff ebd7 af57
307+	feff ead7 abd5 aa55 ab55 aa55 ab75 faf5
308+	aed7 aa57 fa50 a0c1 be5f fa50 0000 0255
309+	b878 f87c 2f17 aa40 8800 2200 8840 2010
310+	8a05 2a05 0a1d 0a1d ae5d ae5d ae5d ee5d
311+	aa55 ae55 aa5d ba55 af5f ab5f bb77 ab77
312+	ffff ffff ffff ffff ffff ffff ffff ffff
313+	ffff ffff ffff ffff fefc fefc fefc feff
314+	0a15 0a05 0a05 0255 a850 a850 a850 a854
315+	8040 0000 0800 0814 2211 2010 2010 2210
316+	8800 2200 0800 2200 8800 2200 8800 2200
317+	8800 2200 8800 2200 8a04 2a10 a840 0200
318+	0800 2200 8800 2015 8800 2200 8800 a800
319+	8800 2200 8800 2240 8801 2201 8801 2001
320+	88c0 aad5 aad5 aa55 2000 ba55 aa55 aa57
321+	8f1f af5f afff bf7f fafd fcfc faf5 faff
322+	3a55 0e07 0301 80c0 aa55 eaf5 fbff ff7f
323+	aa55 ab7f ffff ffff fb75 f8f0 e0c0 80c0
324+	8a14 0800 0000 0000 aa00 0000 0000 0000
325+	0004 0201 0001 0001 2010 2040 8880 a001
326+	3e15 2040 e0f4 feff ef55 0000 0000 80d0
327+	fa55 0a15 0a15 0a15 bf77 a347 a347 83c7
328+	ffff ffff ffff ffff ffff ffff ffff ffff
329+	ffff ffff ffff ffff ffff ffff ffff ffff
330+	feff feff ffff aad5 af57 af57 ab57 ab55
331+	ffff ffff ffff aa55 e8f0 e2e0 e8e0 a240
332+	8800 2200 8800 2200 8800 2200 8800 2200
333+	8801 2204 8000 2810 0800 2204 8810 2240
334+	2040 2200 8800 2200 8800 2200 8800 2200
335+	8000 2a04 8a00 2211 8a07 2e0d 8a1d 3a7d
336+	aa55 aa55 aa55 aa55 ae55 af57 ab55 abff
337+	ffff ffff ffff ffff ffff ffff ffff ffff
338+	e0c0 e0f0 f8f0 f8f0 3f1f 0f07 0301 0001
339+	ffff ffff fefe fefc 8000 8000 0000 0000
340+	0000 0000 0000 0000 0000 0000 0000 0000
341+	0001 0001 0000 0000 8303 8343 8343 8343
342+	ffff ffff ffff ffff faff ffff ffff fbf7
343+	bafd ffff bfdf ff5f ef7f ffff af5f af5f
344+	ffff ffff ffff ffff ffff ffff ffff ffff
345+
346+@dafu10x10
347+	0000 0000 0000 0000 0000 0000 0000 0000
348+	0000 0000 0000 0000 0000 0000 0000 0000
349+	0000 0000 0000 0001 0000 0000 010f 7fff
350+	0000 002f ffff ffff 0000 00fd ffff ffff
351+	0000 0000 e0fc ffff 0000 0000 0000 00e0
352+	0000 0000 0000 0000 0000 0000 0000 0000
353+	0000 0000 0000 0000 0000 0000 0000 0000
354+	0000 0000 0000 0000 0000 0000 0000 0000
355+	0000 0000 0000 0000 0000 0000 0000 0000
356+	0000 0000 0000 0000 0000 0000 0107 071f
357+	071f 3fff fffc f3cf ffff f8c7 3fff ffff
358+	e82f fbfb fbfb fbfb 02ff ffff ffff ffff
359+	bf41 feff ffff ffff fcff 1fe3 fcff ffff
360+	00d0 fcff 7fd2 ffff 0000 00c0 f0f8 5efe
361+	0000 0000 0000 0000 0000 0000 0000 0000
362+	0000 0000 0000 0000 0000 0000 0000 0000
363+	0000 0000 0000 0000 0000 0000 0000 0000
364+	0000 0103 0f1f 3f7e 5f7e f9f3 cf9f 7fff
365+	3f7f ffff ffff ffff ffff ffff ffff ffff
366+	f9fb fbf9 fdf9 fdfd ffff ffff ffff ffff
367+	ffff ffff ffff ffff ffff ffff ffff ffff
368+	ffff ffff ffff ffff ffff ffff feff fefe
369+	0000 0000 0000 0000 0000 0000 0000 0000
370+	0000 0000 0000 0000 0000 0000 0000 0000
371+	0000 0000 0000 0000 0001 002f 1f1f 1f1f
372+	e907 ffff ffff ffff ffff ffff ffff ffff
373+	ffff ffff ffff ffff ffff ffff ffff ffff
374+	fdfd fdfd fcff fd45 ffff ffff ffff ed37
375+	ffff ffff ffff b76c ffff ffff ffff ff0b
376+	ffff ffff ffff ffff fefc fcfc f8fc f8f8
377+	0000 0000 0000 0000 0000 0000 0000 0000
378+	0000 0000 0000 0000 0000 0000 0000 0000
379+	0000 0000 0000 0000 1f1f 1f0f 0f07 0703
380+	ffff ffff ffff ffff ffff ffff fffe fdf5
381+	ffff fceb 8fbf 7fff f48b 7fff ffff ffff
382+	bffe fefa f8fc fdff ffff 7f3f 3f7f bfff
383+	ffff ffff ffff ffff f8ff ffff ffff ffff
384+	7fd7 ffff ffff ffff f0f0 f0e0 e0e0 e0e0
385+	0000 0000 0000 0000 0000 0000 0000 0000
386+	0000 0000 0000 0000 0000 0000 0000 0000
387+	0000 0000 0000 0000 0301 0100 0000 0000
388+	ffff fffc 7d33 3f1f ef9f 7fff ffff ffff
389+	ffff ffff ffff f4cb ffff ffff e807 ffff
390+	ffff ffa0 00c0 0197 ffff 5007 1f03 5eff
391+	ffff a5ff ff6d bfff ffff 4de8 ff7f 6fff
392+	ffff ffbf a7fe fefe f0e0 f0e0 f0e0 b0d0
393+	0000 0000 0000 0000 0000 0000 0000 0000
394+	0000 0000 0000 0000 0000 0000 0000 0000
395+	0000 0000 0000 0000 0000 0000 0000 0000
396+	1f0f 0f0f 0f0e 0e12 fefa f5cf bfff ffff
397+	3fff ffff ffff ffff ffff ffff ffff ffff
398+	f8e0 e0c0 e040 c040 7f7f 5f2f 7b1b 0f0f
399+	ffff ffff ffff ffff ffff ffff ffff ffff
400+	ffff fcfd fbf5 f9d4 50f0 f0e0 f0f0 e060
401+	0000 0000 0000 0000 0000 0000 0000 0000
402+	0000 0000 0000 0000 0000 0000 0000 0000
403+	0000 0000 0000 0000 0000 0000 0000 0000
404+	1a1a 150f 0d07 1100 7fff ffff fdff ffe1
405+	ffff ffff baff ff55 ffff ffaa fdff fe00
406+	c040 d708 f0eb a800 0fa6 7f2f 3fd0 021a
407+	d7bf fff7 086a b8b0 feff e914 a000 0000
408+	ab20 e078 0000 0000 e0c0 d6e1 4084 0204
409+	0000 0000 0000 0000 0000 0000 0000 0000
410+	0000 0000 0000 0000 0000 0000 0000 0000
411+	0000 0000 0000 0000 0000 0000 0000 0000
412+	0402 010a 0200 0000 7876 39b0 5078 9018
413+	0892 71a9 2112 1210 aa00 ff01 7692 0000
414+	a01e 3628 8488 4484 a5a0 0000 0080 8000
415+	2003 070d 3815 0260 feff 7b69 9e60 0000
416+	90e0 8080 0000 0000 c004 8020 8890 8888
417+	0000 0000 0000 0000 0000 0000 0000 0000
418+	0000 0000 0000 0000 0000 0000 0000 0000
419+	0000 0000 0000 0000 0000 0000 0000 0000
420+	0300 0000 0000 0000 2848 8008 4428 0c04
421+	1211 1201 1d14 2a29 1200 0016 dd55 22a9
422+	4084 44ca 8a0d 5800 0000 0800 a02e d105
423+	1000 0000 0080 6a11 0000 0000 0000 8865
424+	0100 0100 0101 005e 2080 2040 4000 0000
425+	0000 0000 0000 0000 0000 0000 0000 0000
426+	0000 0000 0000 0000 0000 0000 0000 0000
427+	0000 0000 0000 0000 0000 0000 0000 0000
428+	0000 0000 0000 0000 0600 0a05 0303 0300
429+	50a0 8040 8000 8000 0000 0000 0000 0000
430+	0000 0000 0000 0000 0000 0000 0000 0000
431+	ad00 0000 0000 0000 510a 0000 0000 0000
432+	2214 0002 0200 0406 0000 0000 0000 0080
433+	0000 0000 0000 0000 0000 0000 0000 0000
434+	0000 0000 0000 0000 0000 0000 0000 0000
435+	0000 0000 0000 0000 0000 0000 0000 0000
436+	0000 0000 0021 010f 0407 0812 2e5c de3e
437+	4000 c060 f0f0 f878 0000 0000 0000 0000
438+	0000 0000 0000 0000 0000 502d 0200 157f
439+	0040 a000 0000 e0f8 0000 0000 0000 0000
440+	060f 0f1f 1737 336b a01c e3f0 feff ffff
441+	0000 407a 05c0 f0fc 0000 0000 807c 0300
442+	0000 0000 0000 a05a 0000 0000 0000 0004
443+	0000 0000 0000 030c 0001 0514 53a7 0f3f
444+	265c 5df9 f3e7 c7cf fbfd fbfb fbfb fbfb
445+	7c7e 7fbf bfff bfff 0000 0090 c0e0 f0f8
446+	0101 0101 0001 0020 7fc8 ff1b c6f0 7f78
447+	fc5c ec08 b858 30e0 0108 0001 0103 0707
448+	6b5b dbdf bbbf bb7f ffff ffff ffff ffff
449+	fefe fcfc f9f3 f3f7 6079 fffe fcfc f9f3
450+	0540 823f 7fff ffff d02c 03f8 feff ffff
451+	3040 800e 3f7f ffff 7f7f 7fff 7f7f 7f7f
452+	9fdf 9f9f df9f 9fdf fbfb fbf3 fbfb fbfb
453+	efff fff7 fffd ffff fefe ffff ffff ff7f
454+	0000 80e0 f0fc ffff 1f02 0000 0001 01e1
455+	c000 00a8 b050 590b 0f1f 1e7d 7dff ffff
456+	7f7f ffff ffff ffff ffff ffff ffff ffff
457+	e7ef cfdf 9f3f 7f3f f3e7 efcf dfbf bf3f
458+	ffff ffff ffff ffff fffe fcf8 f0f0 e0c0
459+	ffff ffff ffff ffff bfbf bfbf dfdf dfcf
460+	9fcf 9fcf dfcf dfcf f7fb fbf7 fbfb fbfb
461+	ffff ffff ffff ffff ffd7 f7fd feff ffff
462+	ffff ffff 7f9e e8e0 ffff fff5 8000 0001
463+	4f47 66a4 7056 4b43 fffe 8001 015f ffff
464+	ffbf 1f7f ffff ffff fefe fcfe fdf9 fbfb
465+	7fff feff fefe fcfe 7f7f 7f7f ffff ffff
466+	ffff fffe fefc f8f8 8183 070f 1f3f 3f7f
467+	ffff ffff 7f3f 9f8f efef eff7 f7f7 f7f7
468+	dfcf efdf cfff cfef fbfb fbf9 fdfd fbfc
469+	ffff fffe f4c0 8000 fffc e080 0000 0000
470+	8000 0000 0000 0000 0506 0802 0300 0000
471+	4925 2365 a2b2 1191 ffff ffff ff05 0000
472+	ffff ffff ff7f 0307 fbfb ffff ffff ffff
473+	fcfd fcfe fdfd fdfd ffff ffff ffff ffff
474+	f0e0 e1c3 8387 0f1f ffff ffff ffff fffe

M src/devices/screen.c

+11, -11

 1@@ -184,20 +184,20 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
 2 		Uint8 move = d[0x6];
 3 		Uint8 length = move >> 4;
 4 		Uint8 twobpp = !!(ctrl & 0x80);
 5-		Uint16 x = PEEK2(d + 0x8);
 6-		Uint16 y = PEEK2(d + 0xa);
 7-		Uint16 addr = PEEK2(d + 0xc);
 8-		Uint16 dx = (move & 0x1) << 3;
 9-		Uint16 dy = (move & 0x2) << 2;
10 		Uint8 *layer = (ctrl & 0x40) ? uxn_screen.fg : uxn_screen.bg;
11+		Uint16 x = PEEK2(d + 0x8), dx = (move & 0x1) << 3;
12+		Uint16 y = PEEK2(d + 0xa), dy = (move & 0x2) << 2;
13+		Uint16 addr = PEEK2(d + 0xc);
14+		int flipx = (ctrl & 0x10), fx = flipx ? -1 : 1;
15+		int flipy = (ctrl & 0x20), fy = flipy ? -1 : 1;
16 		for(i = 0; i <= length; i++) {
17-			screen_blit(layer, ram, addr, x + dy * i, y + dx * i, ctrl & 0xf, ctrl & 0x10, ctrl & 0x20, twobpp);
18-			addr += (move & 0x04) << (1 + twobpp);
19+			screen_blit(layer, ram, addr, x + dy * i * fx, y + dx * i * fy, ctrl & 0xf, flipx, flipy, twobpp);
20+			addr += (move & 0x4) << (1 + twobpp);
21 		}
22-		screen_change(x, y, x + dy * length + 8, y + dx * length + 8);
23-		if(move & 0x1) POKE2(d + 0x8, x + dx); /* auto x+8 */
24-		if(move & 0x2) POKE2(d + 0xa, y + dy); /* auto y+8 */
25-		if(move & 0x4) POKE2(d + 0xc, addr);   /* auto addr+length */
26+		screen_change(x, y, x + dy * length * fx + 8, y + dx * length * fy + 8);
27+		if(move & 0x1) POKE2(d + 0x8, x + dx * fx); /* auto x+8 */
28+		if(move & 0x2) POKE2(d + 0xa, y + dy * fy); /* auto y+8 */
29+		if(move & 0x4) POKE2(d + 0xc, addr);        /* auto addr+length */
30 		break;
31 	}
32 	}

M src/uxn11.c

+2, -2

 1@@ -76,8 +76,8 @@ emu_deo(Uxn *u, Uint8 addr)
 2 }
 3 
 4 int
 5-emu_resize(int width, int height) {
 6-
 7+emu_resize(int width, int height)
 8+{
 9 }
10 
11 static int

commit 9737391

commit `9737391`