From 79b78b5345f3f2d52c11acd2840635a634b36c7f Mon Sep 17 00:00:00 2001
From: lephe <sebastien.mld@numericable.fr>
Date: Tue, 11 Jul 2017 13:51:56 +0200
Subject: [PATCH] Hopefully the last adjustments before the first release.

---
 TODO                          |   7 +-
 configure                     |   6 +-
 demo/asm_syscalls.s           |  56 -------
 demo/gintdemo.c               | 267 +++++++++-------------------------
 demo/perf_bopti.c             | 179 +++++++++++++++++++++++
 demo/resources/opt_bitmap.bmp | Bin 3194 -> 3194 bytes
 demo/resources/opt_gray.bmp   | Bin 3194 -> 3194 bytes
 demo/resources/opt_menu.bmp   | Bin 3194 -> 3194 bytes
 demo/resources/screen.bmp     | Bin 32906 -> 13570 bytes
 demo/resources/town.bmp       | Bin 0 -> 105770 bytes
 demo/test_bopti.c             |  61 +++++---
 demo/test_gray.c              |  49 ++++---
 gscreen.bmp                   | Bin 0 -> 1150 bytes
 gscreend.bmp                  | Bin 0 -> 1150 bytes
 gscreenl.bmp                  | Bin 0 -> 1150 bytes
 include/bfile.h               |  74 ++++++++++
 include/internals/syscalls.h  |   3 +
 include/keyboard.h            |   3 +
 include/modules/interrupts.h  |   6 +-
 src/core/syscalls.s           |  64 ++++++++
 src/gray/grect.c              |   2 +-
 src/init/crt0.c               |   4 +-
 src/keyboard/getkey.c         |  12 +-
 version                       |   2 +-
 24 files changed, 480 insertions(+), 315 deletions(-)
 delete mode 100644 demo/asm_syscalls.s
 create mode 100644 demo/perf_bopti.c
 create mode 100644 demo/resources/town.bmp
 create mode 100644 gscreen.bmp
 create mode 100644 gscreend.bmp
 create mode 100644 gscreenl.bmp
 create mode 100644 include/bfile.h

diff --git a/TODO b/TODO
index ee2bab3..47e0637 100644
--- a/TODO
+++ b/TODO
@@ -14,11 +14,14 @@ Things to do before 1.0:
 
 Things to do later:
 -  bopti:	Implement blending modes for monochrome bitmaps
+-  clock:	Only measure if requires as option, otherwise trust {FTune}
 -  clock:	Handle overclock (relaunch clocks when overclocking)
+-  clock:	Split code into several files, change clock_config_t type
 -  core:	Change interrupt priority using the gint API
 -  core:	Register more interrupts (and understand their parameters)
 -  core:	Remove redundant code linked to environment saves
 -  core:	Review interrupt system (again) - this one is too slow
+-  display:	Try to make this module lighter (lots of code in text section)
 -  errno:	Introduce errno and use it more or less everywhere
 -  esper:	Cleaner playback, synthesizing
 -  events:	Allow customization of keyboard event system (option to return
@@ -26,10 +29,12 @@ Things to do later:
 -  events:	Generate keyboard events on-the-fly by reading state arrays,
    |		allowing both a faster interrupt and avoiding supressing other
    |		events inside getkey() and multigetkey()
+-  gray:	Same as display, it's quite heavy
 -  serial:	Implement a driver
--  stdio:	More serious formatted printing functions
+-  stdio:	More serious formatted printing functions and headers
 -  string:	Use cmp/str to implement memchr() (assembler examples)
 -  string:	Do some tests for memcmp() and memcpy()
+-  string:	Lighter functions?
 -  usb:		Implement a driver
 
 Things to investigate:
diff --git a/configure b/configure
index 83c842f..bb6ae65 100755
--- a/configure
+++ b/configure
@@ -52,11 +52,11 @@ Options that affect the behavior of the library:
     use this option when using both the gray engine and --no-syscalls.
 
 Options that customize size limits:
-  $Cr--atexit-max$C0=$Cy<integer>$Cg [default:$Cp 16$Cg]$C0
+  $Cr--atexit-max=$Cy<integer>$Cg [default:$Cp 16$Cg]$C0
     Number of exit handlers that can be registered by atexit().
-  $Cr--timer-slots$C0=$Cy<integer>$Cg [default:$Cp 16$Cg]$C0
+  $Cr--timer-slots=$Cy<integer>$Cg [default:$Cp 16$Cg]$C0
     Number of virtual timers that may be registered at the same time.
-  $Cr--events-queue-size$C0=$Cy<integer>$Cg [default:$Cp 64$Cg]$C0
+  $Cr--events-queue-size=$Cy<integer>$Cg [default:$Cp 64$Cg]$C0
     Number of events simultaneously stored in the event queue.
 EOF
 
diff --git a/demo/asm_syscalls.s b/demo/asm_syscalls.s
deleted file mode 100644
index 69b4f10..0000000
--- a/demo/asm_syscalls.s
+++ /dev/null
@@ -1,56 +0,0 @@
-
-	# int BFile_Remove(const uint16_t *file)
-	.global	_BFile_Remove
-
-_BFile_Remove:
-	mov.l	1f, r0
-	mov.l	2f, r1
-	jmp	@r1
-	mov	#0, r5
-1:	.long	0x0439
-
-	# int BFile_Create(const uint16_t *file, enum { file = 1, folder = 5 },
-	# int *size)
-	.global	_BFile_Create
-
-_BFile_Create:
-	mov.l	1f, r0
-	mov.l	2f, r1
-	jmp	@r1
-	nop
-1:	.long	0x0434
-
-	# int BFile_Open(const uint16_t *file, int mode)
-	.global	_BFile_Open
-
-_BFile_Open:
-	mov.l	1f, r0
-	mov.l	2f, r1
-	jmp	@r1
-	mov	#0, r6
-1:	.long	0x042c
-
-	# int BFile_Close(int handle)
-	.global	_BFile_Close
-
-_BFile_Close:
-	mov.l	1f, r0
-	mov.l	2f, r1
-	jmp	@r1
-	nop
-1:	.long	0x042d
-
-	# int BFile_Write(int handle, void *ram_buffer, int even_size)
-	.global	_BFile_Write
-
-_BFile_Write:
-	mov.l	1f, r0
-	mov.l	2f, r1
-	jmp	@r1
-	nop
-1:	.long	0x0435
-
-	.align	4
-
-# Syscall branch address
-2:	.long	0x80010070
diff --git a/demo/gintdemo.c b/demo/gintdemo.c
index 4655bf6..16ffaf5 100644
--- a/demo/gintdemo.c
+++ b/demo/gintdemo.c
@@ -54,154 +54,6 @@ void printf_test(void)
 }
 */
 
-/*
-static const unsigned char screen[1024] = {
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 7, 159, 0, 0, 1, 192, 0, 0, 0, 0, 0, 121, 240, 0, 0, 0,
-31, 191, 192, 0, 3, 224, 27, 216, 0, 0, 1, 251, 252, 0, 0, 0, 57, 247, 222,
-30, 7, 240, 36, 36, 62, 25, 131, 159, 24, 255, 129, 224, 0, 227, 142, 126, 1,
-192, 45, 172, 127, 127, 192, 14, 1, 255, 199, 224, 0, 227, 140, 240, 1, 192,
-26, 88, 115, 127, 224, 14, 57, 221, 207, 0, 0, 227, 13, 192, 1, 192, 34, 68,
-120, 30, 0, 14, 25, 156, 220, 0, 0, 227, 253, 252, 1, 192, 36, 36, 126, 28,
-0, 14, 219, 156, 223, 192, 0, 227, 253, 252, 1, 192, 36, 36, 31, 12, 0, 46,
-27, 140, 223, 192, 0, 227, 141, 193, 193, 192, 40, 20, 7, 140, 0, 206, 25, 140,
-220, 28, 0, 227, 140, 225, 129, 199, 24, 24, 99, 156, 1, 14, 25, 204, 206, 24,
-0, 227, 142, 127, 1, 195, 39, 228, 255, 156, 2, 14, 24, 237, 199, 240, 1, 247,
-222, 62, 1, 198, 44, 44, 223, 30, 2, 31, 28, 237, 131, 224, 1, 224, 0, 0, 3,
-254, 27, 216, 0, 0, 4, 30, 0, 0, 0, 0, 3, 192, 0, 0, 7, 252, 0, 0, 0, 0, 4,
-60, 1, 249, 240, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 4, 0, 97, 240, 56, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 1, 224, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-4, 0, 47, 192, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 255, 128, 63, 128,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 32, 255, 0, 48, 78, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 15, 176, 255, 0, 112, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 8, 56, 255, 0,
-96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 98, 8, 60, 255, 0, 224, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 130, 56, 126, 255, 3, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 192,
-62, 255, 15, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 14, 191, 255, 192, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 6, 129, 255, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-1, 0, 0, 6, 0, 255, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 7, 128, 63, 192,
-0, 0, 96, 1, 224, 1, 0, 0, 0, 2, 0, 0, 7, 0, 31, 192, 0, 0, 95, 1, 11, 68, 88,
-0, 0, 4, 0, 0, 7, 128, 31, 192, 0, 1, 192, 129, 204, 85, 100, 0, 0, 8, 0, 0,
-15, 128, 63, 224, 0, 0, 95, 1, 8, 85, 68, 0, 1, 144, 0, 0, 31, 128, 143, 224,
-64, 0, 96, 1, 232, 41, 68, 0, 2, 96, 0, 31, 255, 129, 7, 248, 96, 0, 0, 0, 0,
-0, 0, 0, 4, 0, 0, 96, 254, 129, 7, 254, 96, 0, 0, 0, 0, 0, 0, 0, 4, 0, 1, 128,
-254, 131, 135, 255, 224, 0, 0, 1, 192, 64, 16, 0, 8, 0, 7, 0, 254, 131, 255,
-63, 224, 0, 0, 1, 38, 113, 208, 0, 8, 0, 13, 0, 222, 147, 254, 31, 224, 0, 0,
-1, 41, 74, 80, 0, 8, 0, 25, 0, 222, 67, 254, 31, 160, 0, 0, 1, 41, 74, 80, 0,
-12, 0, 49, 0, 222, 19, 254, 62, 48, 0, 0, 1, 198, 113, 208, 0, 2, 0, 32, 128,
-222, 195, 255, 252, 56, 0, 0, 0, 0, 0, 0, 0, 2, 0, 124, 64, 220, 151, 135, 248,
-127, 0, 0, 0, 0, 0, 0, 0, 2, 0, 66, 32, 221, 223, 7, 240, 255, 0, 0, 0, 0, 0,
-0, 0, 2, 0, 129, 23, 93, 159, 15, 241, 131, 0, 0, 0, 0, 0, 0, 0, 4, 0, 128,
-136, 217, 95, 3, 226, 9, 0, 0, 1, 240, 0, 0, 0, 4, 0, 128, 72, 89, 95, 129,
-228, 18, 0, 0, 0, 0, 0, 0, 0, 4, 1, 0, 72, 73, 127, 128, 224, 36, 0, 0, 0, 0,
-0, 0, 0, 28, 1, 0, 76, 129, 127, 192, 96, 8, 0, 0, 0, 0, 0, 0, 0, 16, 1, 0,
-231, 203, 124, 96, 64, 0, 0, 0, 0, 0, 0, 0, 0, 16, 1, 1, 28, 123, 240, 12, 64,
-1, 0, 0, 0, 0, 0, 0, 0, 16, 1, 2, 28, 143, 128, 15, 192, 7, 0, 0, 0, 0, 0, 0,
-0, 16, 1, 4, 17, 143, 24, 15, 192, 14, 0, 0, 0, 0, 0, 0, 0, 28, 1, 4, 1, 135,
-24, 31, 192, 24, 0, 0, 0, 0, 0, 0, 0, 18, 1, 62, 1, 135, 248, 63, 224, 192,
-0, 0, 0, 0, 0, 0, 0, 35, 1, 195, 1, 135, 128, 254, 126, 1, 0, 0, 0, 0, 0, 0,
-0, 35, 193, 131, 195, 135, 255, 248, 112, 1, 0, 0, 0, 0, 0, 0, 0, 67, 241, 131,
-14, 207, 255, 192, 224, 3, 0, 0, 0, 0, 0, 0, 3, 67, 15, 143, 56, 255, 7, 1,
-224, 7, 0, 0, 0, 0, 0, 0, 28, 130, 7, 255, 112, 204, 7, 131, 224, 31, 0, 0,
-0, 0, 0, 0, 32, 134, 30, 29, 120, 156, 7, 255, 224, 127, 0, 0, 0, 0, 0, 63,
-197, 206, 60, 56, 192, 248, 15, 255, 248, 255, 0, 0, 0, 0, 0, 120, 5, 227, 248,
-56, 195, 248, 127, 191, 254, 63, 0, 0, 0, 0, 7, 254, 255, 193, 255, 15, 193,
-255, 15, 31, 252, 31 };
-
-void ML_bmp_or_cl(const unsigned char *bmp, int x, int y, int width, int height)
-{
-	unsigned short line;
-	char shift, *screen, *p;
-	int i, j, real_width, begin_x, end_x, begin_y, end_y;
-	char bool1=1, bool2=1, bool3;
-	if(!bmp || x<1-width || x>127 || y<1-height || y>63 || height<1 || width<1) return;
-	p = (char*)&line;
-	real_width = (width-1>>3<<3)+8;
-	if(y < 0) begin_y = -y;
-	else begin_y = 0;
-	if(y+height > 64) end_y = 64-y;
-	else end_y = height;
-	shift = 8-(x&7);
-	if(x<0)
-	{
-		begin_x = -x>>3;
-		if(shift != 8) bool1 = 0;
-	} else begin_x = 0;
-	if(x+real_width > 128) end_x = 15-(x>>3), bool2 = 0;
-	else end_x = real_width-1>>3;
-	bool3 = (end_x == real_width-1>>3);
-	screen = display_getCurrentVRAM()+(y+begin_y<<4)+(x>>3);
-
-	for(i=begin_y ; i<end_y ; i++)
-	{
-		if(begin_x < end_x)
-		{
-			line = bmp[i*(real_width>>3)+begin_x] << shift;
-			if(bool1) screen[begin_x] |= *p;
-			if(shift!=8) screen[begin_x+1] |= *(p+1);
-			for(j=begin_x+1 ; j<end_x ; j++)
-			{
-				line = bmp[i*(real_width>>3)+j] << shift;
-				screen[j] |= *p;
-				if(shift!=8) screen[j+1] |= *(p+1);
-			}
-		}
-		line = bmp[i*(real_width>>3)+end_x];
-		if(bool3) line &= -1<<real_width-width;
-		line <<= shift;
-		if(begin_x < end_x || bool1) screen[end_x] |= *p;
-		if(bool2) screen[end_x+1] |= *(p+1);
-		screen += 16;
-	}
-}
-
-#include <internals/timer.h>
-void debug(void)
-{
-	extern Image res_screen_start;
-	struct mod_tmu *timer;
-	int time1, time2;
-	int i;
-
-	timer_get(TIMER_USER, &timer, NULL);
-
-	dclear();
-	ML_bmp_or_cl(screen, 1, 1, 128, 64);
-	dupdate();
-	getkey();
-
-	dclear();
-	dimage(&res_screen_start, 1, 1);
-	dupdate();
-	getkey();
-
-	dclear();
-	dtext("ML...", 2, 2);
-	dupdate();
-
-	timer_start2(TIMER_USER, 0x0fffffff, TIMER_Po_4, NULL, 0);
-	for(i = 0; i < 1000; i++) ML_bmp_or_cl(screen, 1, 1, 128, 64);
-	time1 = timer->TCNT;
-	timer_stop(TIMER_USER);
-	time1 = 0x0fffffff - time1;
-
-	dclear();
-	dtext("gint...", 2, 2);
-	dupdate();
-
-	timer_start2(TIMER_USER, 0x0fffffff, TIMER_Po_4, NULL, 0);
-	for(i = 0; i < 1000; i++) dimage(&res_screen_start, 1, 1);
-	time2 = timer->TCNT;
-	timer_stop(TIMER_USER);
-	time2 = 0x0fffffff - time2;
-
-	dclear();
-	print_hex(time1, 2, 2);
-	print_hex(time2, 2, 9);
-	dupdate();
-	while(getkey() != KEY_EXIT);
-}
-*/
-
 /*
 	tlb_debug()
 	Displays the TLB contents and some information. Only available for
@@ -311,15 +163,13 @@ void main_menu(int *category, int *app)
 		"Clocks and timers",
 		NULL
 	};
+/*
 	const char *list_perfs[] = {
 		"Image rendering",
 		"Text rendering",
 		NULL
 	};
-	const char *list_debug[] = {
-		"View TLB (SH3 only)",
-		NULL
-	};
+*/
 	const char **list = NULL;
 	int list_len = 0;
 
@@ -367,22 +217,17 @@ void main_menu(int *category, int *app)
 			locate(1, 1, "Test list");
 			list = list_tests;
 			break;
-
+/*
 		case 2:
 			locate(1, 1, "Performance");
 			list = list_perfs;
 			break;
-
-		case 3:
-			locate(1, 1, "Debug");
-			list = list_debug;
-			break;
-
+*/
 		default:
 			print(1, 1, "Tab %d", tab);
 			break;
 		}
-		dimage(0, 56, &res_opt_menu);
+		dimage_part(0, 56, &res_opt_menu, 0, 0, 42, 8);
 
 		if(list)
 		{
@@ -422,22 +267,17 @@ void main_menu(int *category, int *app)
 				index	= 0;
 				scroll	= 0;
 				break;
-			case KEY_F3:
+/*			case KEY_F3:
+				*category = 2;
+				*app = 1;
+				return;
+*/
+/*			case KEY_F3:
 				if(tab == 2) break;
 				tab	= 2;
 				index	= 0;
 				scroll	= 0;
 				break;
-			case KEY_F4:
-				if(tab == 3) break;
-				tab	= 3;
-				index	= 0;
-				scroll	= 0;
-				break;
-/*			case KEY_F6:;
-				void screen(void);
-				screen();
-				break;
 */
 			case KEY_UP:
 				if(list && list_len > 1)
@@ -514,36 +354,18 @@ int main(void)
 		case 0x0105: test_rtc();			break;
 		case 0x0106: test_timer();			break;
 
-		case 0x0201: /* perf_bopti(); */		break;
+		case 0x0201: perf_bopti();			break;
 		case 0x0202: /* perf_tales(); */		break;
-
-		case 0x0301: /* if(isSH3()) debug_tlb(); */	break;
 		}
 	}
 
 	return 0;
 }
 
-static void crash(void)
+/*
+#include <bfile.h>
+void screen(void)
 {
-	__asm__(
-		"mov	#0, r0		\n\t"
-		"ldc	r0, vbr		\n\t"
-		"trapa	#1		"
-	);
-}
-
-static void screen(void)
-{
-	enum { File = 1, Folder = 5 };
-	enum { Read = 0x01, Write = 0x02, ReadWrite = Read | Write };
-
-	int BFile_Remove(const uint16_t *file);
-	int BFile_Create(const uint16_t *file, int type, int *size);
-	int BFile_Open(const uint16_t *file, int mode);
-	int BFile_Close(int handle);
-	int BFile_Write(int handle, const void *ram_buffer, int even_size);
-
 	const uint8_t bmp_header[0x7e] = {
 		0x42, 0x4d, 0x7e, 0x04, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6c, 0x00,
@@ -567,8 +389,8 @@ static void screen(void)
 	int size = 0x7e + 1024;
 
 	BFile_Remove(file);
-	BFile_Create(file, File, &size);
-	int handle = BFile_Open(file, Write);
+	BFile_Create(file, BFile_File, &size);
+	int handle = BFile_Open(file, BFile_WriteOnly);
 	BFile_Write(handle, bmp_header, 0x7e);
 	void *vram = (void *)display_getCurrentVRAM() + 1024;
 	for(int i = 1; i <= 64; i++)
@@ -577,3 +399,58 @@ static void screen(void)
 	}
 	BFile_Close(handle);
 }
+void screengray(void)
+{
+	const uint8_t bmp_header[0x7e] = {
+		0x42, 0x4d, 0x7e, 0x04, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6c, 0x00,
+		0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x00,
+		0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x13, 0x0b,
+		0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x01, 0x00,
+		0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x42, 0x47,
+		0x52, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0xff, 0xff, 0xff, 0x00,
+	};
+	uint16_t file[] = { '\\', '\\', 'f', 'l', 's', '0', '\\', 'g', 's',
+		'c', 'r', 'e', 'e', 'n', '#', '.', 'b', 'm', 'p', 0x00 };
+	int size = 0x7e + 1024;
+	void *vram;
+	int handle;
+
+	gupdate();
+
+	file[14] = 'l';
+	BFile_Remove(file);
+	BFile_Create(file, BFile_File, &size);
+	handle = BFile_Open(file, BFile_WriteOnly);
+	BFile_Write(handle, bmp_header, 0x7e);
+	vram = (void *)gray_lightVRAM() + 1024;
+	for(int i = 1; i <= 64; i++)
+	{
+		BFile_Write(handle, vram - 16 * i, 16);
+	}
+	BFile_Close(handle);
+
+	file[14] = 'd';
+	BFile_Remove(file);
+	BFile_Create(file, BFile_File, &size);
+	handle = BFile_Open(file, BFile_WriteOnly);
+	BFile_Write(handle, bmp_header, 0x7e);
+	vram = (void *)gray_darkVRAM() + 1024;
+	for(int i = 1; i <= 64; i++)
+	{
+		BFile_Write(handle, vram - 16 * i, 16);
+	}
+	BFile_Close(handle);
+
+	gupdate();
+}
+*/
diff --git a/demo/perf_bopti.c b/demo/perf_bopti.c
new file mode 100644
index 0000000..94a9907
--- /dev/null
+++ b/demo/perf_bopti.c
@@ -0,0 +1,179 @@
+#include <timer.h>
+#include <modules/timer.h>
+#include <display.h>
+#include <keyboard.h>
+#include <stdint.h>
+
+/*
+static const uint8_t screen[1024] = {
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 7, 159, 0, 0, 1, 192, 0, 0, 0, 0, 0, 121, 240, 0, 0, 0,
+31, 191, 192, 0, 3, 224, 27, 216, 0, 0, 1, 251, 252, 0, 0, 0, 57, 247, 222,
+30, 7, 240, 36, 36, 62, 25, 131, 159, 24, 255, 129, 224, 0, 227, 142, 126, 1,
+192, 45, 172, 127, 127, 192, 14, 1, 255, 199, 224, 0, 227, 140, 240, 1, 192,
+26, 88, 115, 127, 224, 14, 57, 221, 207, 0, 0, 227, 13, 192, 1, 192, 34, 68,
+120, 30, 0, 14, 25, 156, 220, 0, 0, 227, 253, 252, 1, 192, 36, 36, 126, 28,
+0, 14, 219, 156, 223, 192, 0, 227, 253, 252, 1, 192, 36, 36, 31, 12, 0, 46,
+27, 140, 223, 192, 0, 227, 141, 193, 193, 192, 40, 20, 7, 140, 0, 206, 25, 140,
+220, 28, 0, 227, 140, 225, 129, 199, 24, 24, 99, 156, 1, 14, 25, 204, 206, 24,
+0, 227, 142, 127, 1, 195, 39, 228, 255, 156, 2, 14, 24, 237, 199, 240, 1, 247,
+222, 62, 1, 198, 44, 44, 223, 30, 2, 31, 28, 237, 131, 224, 1, 224, 0, 0, 3,
+254, 27, 216, 0, 0, 4, 30, 0, 0, 0, 0, 3, 192, 0, 0, 7, 252, 0, 0, 0, 0, 4,
+60, 1, 249, 240, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 4, 0, 97, 240, 56, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 1, 224, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+4, 0, 47, 192, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 255, 128, 63, 128,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 32, 255, 0, 48, 78, 0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 15, 176, 255, 0, 112, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 8, 56, 255, 0,
+96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 98, 8, 60, 255, 0, 224, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 130, 56, 126, 255, 3, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 192,
+62, 255, 15, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 14, 191, 255, 192, 0,
+0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 6, 129, 255, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+1, 0, 0, 6, 0, 255, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 7, 128, 63, 192,
+0, 0, 96, 1, 224, 1, 0, 0, 0, 2, 0, 0, 7, 0, 31, 192, 0, 0, 95, 1, 11, 68, 88,
+0, 0, 4, 0, 0, 7, 128, 31, 192, 0, 1, 192, 129, 204, 85, 100, 0, 0, 8, 0, 0,
+15, 128, 63, 224, 0, 0, 95, 1, 8, 85, 68, 0, 1, 144, 0, 0, 31, 128, 143, 224,
+64, 0, 96, 1, 232, 41, 68, 0, 2, 96, 0, 31, 255, 129, 7, 248, 96, 0, 0, 0, 0,
+0, 0, 0, 4, 0, 0, 96, 254, 129, 7, 254, 96, 0, 0, 0, 0, 0, 0, 0, 4, 0, 1, 128,
+254, 131, 135, 255, 224, 0, 0, 1, 192, 64, 16, 0, 8, 0, 7, 0, 254, 131, 255,
+63, 224, 0, 0, 1, 38, 113, 208, 0, 8, 0, 13, 0, 222, 147, 254, 31, 224, 0, 0,
+1, 41, 74, 80, 0, 8, 0, 25, 0, 222, 67, 254, 31, 160, 0, 0, 1, 41, 74, 80, 0,
+12, 0, 49, 0, 222, 19, 254, 62, 48, 0, 0, 1, 198, 113, 208, 0, 2, 0, 32, 128,
+222, 195, 255, 252, 56, 0, 0, 0, 0, 0, 0, 0, 2, 0, 124, 64, 220, 151, 135, 248,
+127, 0, 0, 0, 0, 0, 0, 0, 2, 0, 66, 32, 221, 223, 7, 240, 255, 0, 0, 0, 0, 0,
+0, 0, 2, 0, 129, 23, 93, 159, 15, 241, 131, 0, 0, 0, 0, 0, 0, 0, 4, 0, 128,
+136, 217, 95, 3, 226, 9, 0, 0, 1, 240, 0, 0, 0, 4, 0, 128, 72, 89, 95, 129,
+228, 18, 0, 0, 0, 0, 0, 0, 0, 4, 1, 0, 72, 73, 127, 128, 224, 36, 0, 0, 0, 0,
+0, 0, 0, 28, 1, 0, 76, 129, 127, 192, 96, 8, 0, 0, 0, 0, 0, 0, 0, 16, 1, 0,
+231, 203, 124, 96, 64, 0, 0, 0, 0, 0, 0, 0, 0, 16, 1, 1, 28, 123, 240, 12, 64,
+1, 0, 0, 0, 0, 0, 0, 0, 16, 1, 2, 28, 143, 128, 15, 192, 7, 0, 0, 0, 0, 0, 0,
+0, 16, 1, 4, 17, 143, 24, 15, 192, 14, 0, 0, 0, 0, 0, 0, 0, 28, 1, 4, 1, 135,
+24, 31, 192, 24, 0, 0, 0, 0, 0, 0, 0, 18, 1, 62, 1, 135, 248, 63, 224, 192,
+0, 0, 0, 0, 0, 0, 0, 35, 1, 195, 1, 135, 128, 254, 126, 1, 0, 0, 0, 0, 0, 0,
+0, 35, 193, 131, 195, 135, 255, 248, 112, 1, 0, 0, 0, 0, 0, 0, 0, 67, 241, 131,
+14, 207, 255, 192, 224, 3, 0, 0, 0, 0, 0, 0, 3, 67, 15, 143, 56, 255, 7, 1,
+224, 7, 0, 0, 0, 0, 0, 0, 28, 130, 7, 255, 112, 204, 7, 131, 224, 31, 0, 0,
+0, 0, 0, 0, 32, 134, 30, 29, 120, 156, 7, 255, 224, 127, 0, 0, 0, 0, 0, 63,
+197, 206, 60, 56, 192, 248, 15, 255, 248, 255, 0, 0, 0, 0, 0, 120, 5, 227, 248,
+56, 195, 248, 127, 191, 254, 63, 0, 0, 0, 0, 7, 254, 255, 193, 255, 15, 193,
+255, 15, 31, 252, 31 };
+*/
+
+static const uint8_t town[4464] = { 4, 0, 0, 16, 2, 115, 130, 6, 243, 130, 6, 243, 130, 6, 243, 130, 4, 0, 0, 16, 2, 115, 130, 6, 243, 130, 6, 243, 130, 6, 243, 130, 4, 0, 0, 16, 255, 255, 255, 240, 3, 255, 198, 15, 127, 198, 15, 127, 198, 15, 127, 198, 255, 255, 255, 240, 3, 255, 198, 15, 127, 198, 15, 127, 198, 15, 127, 198, 255, 255, 255, 240, 0, 144, 3, 192, 0, 112, 255, 30, 112, 255, 30, 112, 255, 30, 112, 255, 0, 144, 3, 192, 0, 112, 255, 30, 112, 255, 30, 112, 255, 30, 112, 255, 0, 144, 3, 192, 0, 144, 2, 192, 15, 240, 195, 255, 240, 195, 255, 240, 195, 255, 240, 195, 0, 144, 2, 192, 15, 240, 195, 255, 240, 195, 255, 240, 195, 255, 240, 195, 0, 144, 2, 192, 0, 144, 2, 64, 112, 15, 129, 240, 15, 129, 240, 15, 129, 240, 15, 129, 0, 144, 2, 64, 112, 15, 129, 240, 15, 129, 240, 15, 129, 240, 15, 129, 0, 144, 2, 64, 0, 208, 3, 64, 128, 1, 193, 128, 1, 193, 128, 1, 193, 128, 1, 193, 0, 208, 3, 64, 128, 1, 193, 128, 1, 193, 128, 1, 193, 128, 1, 193, 0, 208, 3, 64, 255, 223, 255, 67, 0, 0, 227, 0, 0, 227, 0, 0, 227, 0, 0, 227, 255, 223, 255, 67, 0, 0, 227, 0, 0, 227, 0, 0, 227, 0, 0, 227, 255, 223, 255, 64, 112, 195, 129, 194, 0, 0, 126, 0, 0, 126, 0, 0, 126, 0, 0, 126, 112, 195, 129, 194, 0, 0, 126, 0, 0, 126, 0, 0, 126, 0, 0, 126, 112, 195, 129, 192, 247, 255, 254, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 247, 255, 254, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 247, 255, 254, 192, 72, 0, 2, 98, 240, 113, 202, 240, 113, 202, 240, 113, 202, 240, 113, 202, 72, 0, 2, 98, 240, 113, 202, 240, 113, 202, 240, 113, 202, 240, 113, 202, 72, 0, 2, 96, 240, 0, 2, 70, 25, 255, 46, 25, 255, 46, 25, 255, 46, 25, 255, 46, 240, 0, 2, 70, 25, 255, 46, 25, 255, 46, 25, 255, 46, 25, 255, 46, 240, 0, 2, 64, 96, 1, 226, 198, 30, 48, 110, 30, 48, 110, 30, 48, 110, 30, 48, 110, 96, 1, 226, 198, 30, 48, 110, 30, 48, 110, 30, 48, 110, 30, 48, 110, 96, 1, 226, 192, 64, 2, 19, 199, 56, 32, 111, 56, 32, 111, 56, 32, 111, 56, 32, 111, 64, 2, 19, 199, 56, 32, 111, 56, 32, 111, 56, 32, 111, 56, 32, 111, 64, 2, 19, 192, 128, 2, 19, 71, 252, 96, 247, 252, 96, 247, 252, 96, 247, 252, 96, 247, 128, 2, 19, 71, 252, 96, 247, 252, 96, 247, 252, 96, 247, 252, 96, 247, 128, 2, 19, 64, 0, 2, 19, 71, 15, 241, 231, 15, 241, 231, 15, 241, 231, 15, 241, 231, 0, 2, 19, 71, 15, 241, 231, 15, 241, 231, 15, 241, 231, 15, 241, 231, 0, 2, 19, 64, 3, 194, 18, 71, 12, 63, 255, 12, 63, 231, 12, 63, 231, 12, 63, 255, 3, 194, 18, 71, 12, 63,
+255, 12, 63, 231, 12, 63, 231, 12, 63, 255, 3, 194, 18, 64, 6, 99, 242, 195, 152, 31, 0, 248, 31, 195, 152, 31, 195, 152, 31, 0, 6, 99, 242, 195, 152, 31, 0, 248, 31, 195, 152, 31, 195, 152, 31, 0, 6, 99, 242, 192, 10, 84, 10, 193, 252, 24, 0, 28, 31, 129, 252, 31, 129, 252, 24, 0, 10, 84, 10, 193, 252, 24, 0, 28, 31, 129, 252, 31, 129, 252, 24, 0, 10, 84, 10, 192, 10, 87, 251, 192, 126, 48, 0, 14, 62, 0, 126, 62, 0, 126, 48, 0, 10, 87, 251, 192, 126, 48, 0, 14, 62, 0, 126, 62, 0, 126, 48, 0, 10, 87, 251, 192, 10, 80, 3, 192, 31, 224, 0, 7, 252, 3, 255, 255, 255, 255, 224, 0, 10, 80, 3, 192, 31, 224, 0, 7, 252, 3, 255, 255, 255, 255, 224, 0, 10, 80, 3, 192, 10, 208, 3, 64, 12, 56, 0, 12, 32, 6, 16, 64, 0, 2, 56, 0, 10, 208, 3, 64, 12, 56, 0, 12, 32, 6, 16, 64, 0, 2, 56, 0, 10, 208, 3, 64, 250, 95, 254, 64, 56, 175, 7, 28, 144, 7, 255, 252, 0, 2, 175, 7, 250, 95, 254, 64, 56, 175, 7, 28, 144, 7, 255, 252, 0, 2, 175, 7, 250, 95, 254, 64, 106, 86, 219, 64, 34, 225, 159, 242, 200, 4, 130, 8, 0, 2, 225, 159, 106, 86, 219, 64, 34, 225, 159, 242, 200, 4, 130, 8, 0, 2, 225, 159, 106, 86, 219, 64, 10, 80, 3, 64, 62, 225, 227, 6, 228, 15, 255, 240, 0, 1, 225, 227, 10, 80, 3, 64, 62, 225, 227, 6, 228, 15, 255, 240, 0, 1, 225, 227, 10, 80, 3, 64, 255, 255, 255, 192, 4, 243, 130, 6, 156, 10, 16, 64, 0, 1, 243, 130, 255, 255, 255, 192, 4, 243, 130, 6, 156, 10, 16, 64, 0, 1, 243, 130, 255, 255, 255, 192, 0, 0, 3, 192, 7, 127, 198, 15, 0, 15, 255, 255, 255, 255, 127, 198, 0, 0, 3, 192, 7, 127, 198, 15, 0, 15, 255, 255, 255, 255, 127, 198, 0, 0, 3, 192, 0, 0, 0, 0, 0, 112, 255, 30, 0, 3, 192, 0, 0, 60, 112, 255, 0, 0, 0, 0, 0, 112, 255, 30, 0, 3, 192, 0, 0, 60, 112, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 195, 254, 0, 2, 198, 0, 220, 44, 112, 195, 0, 0, 0, 0, 0, 112, 195, 254, 0, 2, 198, 0, 220, 44, 112, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57, 129, 252, 0, 2, 69, 0, 168, 36, 57, 129, 0, 0, 0, 0, 0, 57, 129, 252, 0, 2, 69, 0, 168, 36, 57, 129, 0, 0, 0, 0, 0, 0, 0, 0, 128, 31, 193, 248, 0, 3, 117, 62, 87, 244, 31, 193, 0, 0, 0, 0, 128, 31, 193, 248, 0, 3, 117, 62, 87, 244, 31, 193, 0, 0, 0, 0, 0, 0, 0, 2, 160, 7, 227, 224, 0, 3, 72, 128, 168, 52, 7, 227, 0, 0, 0, 2, 160, 7, 227, 224, 0, 3, 72, 128, 168, 52, 7, 227, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 255, 192, 0, 3, 232, 246, 245, 252, 1, 254, 0, 0, 0, 1, 64, 1, 255, 192, 0, 3, 232, 246, 245, 252, 1, 254, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 194, 0, 16, 2, 199, 40, 138, 44, 0, 195, 0, 0, 0, 128, 0, 0, 194, 0, 16, 2, 199, 40, 138, 44, 0, 195, 0, 0, 0, 128, 0, 0, 2, 160, 0, 3, 137, 0, 40, 2, 64, 24, 6, 36, 3, 138, 0, 0, 2, 160, 0, 3, 137, 0, 40, 2, 64, 24, 6, 36, 3, 138, 0, 0, 2, 160, 0, 0, 1, 64, 0, 2, 44, 128, 40, 2, 64, 0, 0, 36, 2, 46, 0, 0, 1, 64, 0, 2, 44, 128, 40, 2, 64, 0, 0, 36, 2, 46, 0, 0, 1, 64, 0, 0, 0, 0, 0, 3, 238, 64, 68, 2, 192, 0, 0, 44, 3, 238, 0, 0, 0, 0, 0, 3, 238, 64, 68, 2, 192, 0, 0, 44, 3, 238, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, 192, 68, 3, 192, 63, 192, 60, 0, 79, 0, 0, 0, 0, 0, 0, 73, 192, 68, 3, 192, 63, 192, 60, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, 56, 3, 64, 124, 32, 52, 0, 119, 0, 0, 0, 0, 0, 0, 112, 0, 56, 3, 64, 124, 32, 52, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 3, 64, 80, 32, 52, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 16, 3, 64, 80, 32, 52, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 64, 248, 16, 36, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 64, 248, 16, 36, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 192, 192, 16, 44, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 192, 192, 16, 44, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 2, 192, 255, 240, 44, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 2, 192, 255, 240, 44, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 3, 192, 41, 64, 60, 48, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 3, 192, 41, 64, 60, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 3, 192, 41, 64, 60, 32, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 3, 192, 41, 64, 60, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 16, 3, 64, 47, 64, 52, 56, 0, 0, 0, 0, 0, 8, 0, 0, 8, 16, 3, 64, 47, 64, 52, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 42, 40, 2, 127, 224, 127, 230, 47, 7, 0, 0, 0, 0, 42, 0, 0, 42, 40, 2, 127, 224, 127, 230, 47, 7, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 20, 40, 3, 118, 227, 109, 180, 97, 159, 0, 0, 0, 0, 20, 0, 0, 20, 40, 3, 118, 227, 109, 180, 97, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 3, 64, 32, 64, 52, 97, 227, 0, 0, 0, 0, 0, 0, 0, 0, 68, 3, 64, 32, 64, 52, 97, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 3, 255, 255, 255, 252, 115, 130, 0, 0, 0, 0, 0, 0, 0, 0, 124, 3, 255, 255, 255, 252, 115, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 192, 0, 0, 60, 127, 198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 192, 0, 0, 60, 127, 198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, 112, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, 112, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 132, 0, 0, 112, 195, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 132, 0, 0, 112, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 126, 0, 0, 120, 0, 0, 57, 129, 0, 0, 0, 0, 0, 0, 0, 40, 126, 0, 0, 120, 0, 0, 57, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 252, 0, 0, 3, 240, 0, 31, 193, 0, 0, 0, 0, 0, 0, 0, 43, 252, 0, 0, 3, 240, 0, 31, 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 134, 0, 0, 2, 16, 0, 7, 227, 0, 0, 0, 0, 0, 0, 0, 21, 134, 0, 0, 2, 16, 0, 7, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 6, 0, 0, 1, 224, 0, 1, 254, 0, 0, 0, 0, 0, 0, 0, 23, 6, 0, 0, 1, 224, 0, 1, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 62, 0, 0, 252, 0, 0, 0, 195, 0, 0, 0, 0, 0, 0, 0, 15, 62, 0, 0, 252, 0, 0, 0, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 250, 0, 0, 132, 0, 0, 3, 138, 0, 0, 0, 0, 0, 0, 0, 14, 250, 0, 0, 132, 0, 0, 3, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 190, 0, 0, 120, 0, 0, 2, 46, 0, 0, 0, 0, 0, 0, 0, 6, 190, 0, 0, 120, 0, 0, 2, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 156, 0, 0, 3, 240, 0, 3, 238, 0, 0, 0, 0, 0, 0, 0, 3, 156, 0, 0, 3, 240, 0, 3, 238, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 36, 0, 0, 2, 16, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 1, 36, 0, 0, 2, 16, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 0, 0, 1, 224, 0, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 216, 0, 0, 1, 224, 0, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 4, 0, 0, 16, 2, 115, 130, 6, 243, 130, 6, 243, 130, 6, 243, 130, 4, 0, 0, 16, 2, 115, 130, 6, 243, 130, 6, 243, 130, 6, 243, 130, 4, 0, 0, 16, 255, 255, 255, 240, 3, 255, 198, 15, 127, 198, 15, 127, 198, 15, 127, 198, 255, 255, 255, 240, 3, 255, 198, 15, 127, 198, 15, 127, 198, 15, 127, 198, 255, 255, 255, 240, 0, 144, 3, 192, 0, 112, 255, 30, 112, 255, 30, 112, 255, 30, 112, 255, 0, 144, 3, 192, 0, 112, 255, 30, 112, 255, 30, 112, 255, 30, 112, 255, 0, 144, 3, 192, 0, 144, 2, 192, 15, 240, 195, 255, 240, 195, 255, 240, 195, 255, 240, 195, 0, 144, 2, 192, 15, 240, 195, 255, 240, 195, 255, 240, 195, 255, 240, 195, 0, 144, 2, 192, 0, 144, 2, 64, 112, 15, 129, 240, 15, 129, 240, 15, 129, 240, 15, 129, 0, 144, 2, 64, 112, 15, 129, 240, 15, 129, 240, 15, 129, 240, 15, 129, 0, 144, 2, 64, 0, 208, 3, 64, 128, 1, 193, 128, 1, 193, 128, 1, 193, 128, 1, 193, 0, 208, 3, 64, 128, 1, 193, 128, 1, 193, 128, 1, 193, 128, 1, 193, 0, 208, 3, 64, 255, 223, 255, 67, 0, 0, 227, 0, 0, 227, 0, 0, 227, 0, 0, 227, 255, 223, 255, 67, 0, 0, 227, 0, 0, 227, 0, 0, 227, 0, 0, 227, 255, 223, 255, 64, 112, 195, 129, 194, 0, 0, 126, 0, 0, 126, 0, 0, 126, 0, 0, 126, 112, 195, 129, 194, 0, 0, 126, 0, 0, 126, 0, 0, 126, 0, 0, 126, 112, 195, 129, 192, 247, 255, 254, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 247, 255, 254, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 128, 0, 195, 247, 255, 254, 192, 72, 0, 2, 98, 240, 113, 202, 240, 113, 202, 240, 113, 202, 240, 113, 202, 72, 0, 2, 98, 240, 113, 202, 240, 113, 202, 240, 113, 202, 240, 113, 202, 72, 0, 2, 96, 240, 0, 2, 70, 25, 255, 46, 25, 255, 46, 25, 255, 46, 25, 255, 46, 240, 0, 2, 70, 25, 255, 46, 25, 255, 46, 25, 255, 46, 25, 255, 46, 240, 0, 2, 64, 96, 1, 226, 198, 30, 48, 110, 30, 48, 110, 30, 48, 110, 30, 48, 110, 96, 1, 226, 198, 30, 48, 110, 30, 48, 110, 30, 48, 110, 30, 48, 110, 96, 1, 226, 192, 64, 2, 19, 199, 56, 32, 111, 56, 32, 111, 56, 32, 111, 56, 32, 111, 64, 2, 19, 199, 56, 32, 111, 56, 32, 111, 56, 32, 111, 56, 32, 111, 64, 2, 19, 192, 128, 2, 19, 71, 252, 96, 247, 252, 96, 247, 252, 96, 247, 252, 96, 247, 128, 2, 19, 71, 252, 96, 247, 252, 96, 247, 252, 96, 247, 252, 96, 247, 128, 2, 19, 64, 0, 2, 19, 71, 15, 241, 231, 15, 241, 231, 15, 241, 231, 15, 241, 231, 0, 2, 19, 71, 15, 241, 231, 15, 241, 231, 15, 241, 231, 15, 241, 231, 0, 2, 19, 64, 3, 194, 18, 71, 12, 63, 255, 12, 63, 231, 12, 63, 231, 12, 63, 255, 3, 194, 18, 71, 12, 63, 255, 12, 63, 231, 12, 63, 231, 12, 63, 255, 3, 194, 18, 64, 6, 99, 242, 195, 152, 31, 0, 248, 31, 195, 152, 31, 195, 152, 31, 0, 6, 99, 242, 195, 152, 31, 0, 248, 31, 195, 152, 31, 195, 152, 31, 0, 6, 99, 242, 192, 10, 84, 10, 193, 252, 24, 0, 28, 31, 129, 252, 31, 129, 252, 24, 0, 10, 84, 10, 193, 252, 24, 0, 28, 31, 129, 252, 31, 129, 252, 24, 0, 10, 84, 10, 192, 10, 87, 251, 192, 126, 48, 0, 14, 62, 0, 126, 62, 0, 126, 48, 0, 10, 87, 251, 192, 126, 48, 0, 14, 62, 0, 126, 62, 0, 126, 48, 0, 10, 87, 251, 192, 10, 80, 3, 192, 31, 224, 0, 7, 252, 3, 255, 255, 255, 255, 224, 0, 10, 80, 3, 192, 31, 224, 0, 7, 252, 3, 255, 255, 255, 255, 224, 0, 10, 80, 3, 192, 10, 208, 3, 64, 12, 56, 0, 12, 32, 6, 16, 64, 0, 2, 56, 0, 10, 208, 3, 64, 12, 56, 0, 12, 32, 6, 16, 64, 0, 2, 56, 0, 10, 208, 3, 64, 250, 95, 254, 64, 56, 175, 7, 28, 144, 7, 255, 252, 0, 2, 175, 7, 250, 95, 254, 64, 56, 175, 7, 28, 144, 7, 255, 252, 0, 2, 175, 7, 250, 95, 254, 64, 106, 86, 219, 64, 34, 225, 159, 242, 200, 4, 130, 8, 0, 2, 225, 159, 106, 86, 219, 64, 34, 225, 159, 242, 200, 4, 130, 8, 0, 2, 225, 159, 106, 86, 219, 64, 10, 80, 3, 64, 62, 225, 227, 6, 228, 15, 255, 240, 0, 1, 225, 227, 10, 80, 3, 64, 62, 225, 227, 6, 228, 15, 255, 240, 0, 1, 225, 227, 10, 80, 3, 64, 255, 255, 255, 192, 4, 243, 130, 6, 156, 10, 16, 64, 0, 1, 243, 130, 255, 255, 255, 192, 4, 243, 130, 6, 156, 10, 16, 64, 0, 1, 243, 130, 255, 255, 255, 192, 0, 0, 3, 192, 7, 127, 198, 15, 0, 15, 255, 255, 255, 255, 127, 198, 0, 0, 3, 192, 7, 127, 198, 15, 0, 15, 255, 255, 255, 255, 127, 198, 0, 0, 3, 192, 0, 0, 0, 0, 0, 112, 255, 30, 0, 3, 192, 0, 0, 60, 112, 255, 0, 0, 0, 0, 0, 112, 255, 30, 0, 3, 192, 0, 0, 60, 112, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 195, 254, 0, 2, 198, 0, 220, 44, 112, 195, 0, 0, 0, 0, 0, 112, 195, 254, 0, 2, 198, 0, 220, 44, 112, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57, 129, 252, 0, 2, 69, 0, 168, 36, 57, 129, 0, 0, 0, 0, 0, 57, 129, 252, 0, 2, 69, 0, 168, 36, 57, 129, 0, 0, 0, 0, 0, 0, 0, 0, 128, 31, 193, 248, 0, 3, 117, 62, 87, 244, 31, 193, 0, 0, 0, 0, 128, 31, 193, 248, 0, 3, 117, 62, 87, 244, 31, 193, 0, 0, 0, 0, 0, 0, 0, 2, 160, 7, 227, 224, 0, 3, 72, 128, 168, 52, 7, 227, 0, 0, 0, 2, 160, 7, 227, 224, 0, 3, 72, 128, 168, 52, 7, 227, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 255, 192, 0, 3, 232, 246, 245, 252, 1, 254, 0, 0, 0, 1, 64, 1, 255, 192, 0, 3, 232, 246, 245, 252, 1, 254, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 194, 0, 16, 2, 199, 40, 138, 44, 0, 195, 0, 0, 0, 128, 0, 0, 194, 0, 16, 2, 199, 40, 138, 44, 0, 195, 0, 0, 0, 128, 0, 0, 2, 160, 0, 3, 137, 0, 40, 2, 64, 24, 6, 36, 3, 138, 0, 0, 2, 160, 0, 3, 137, 0, 40, 2, 64, 24, 6, 36, 3, 138, 0, 0, 2, 160, 0, 0, 1, 64, 0, 2, 44, 128, 40, 2, 64, 0, 0, 36, 2, 46, 0, 0, 1, 64, 0, 2, 44, 128, 40, 2, 64, 0, 0, 36, 2, 46, 0, 0, 1, 64, 0, 0, 0, 0, 0, 3, 238, 64, 68, 2, 192, 0, 0, 44, 3, 238, 0, 0, 0, 0, 0, 3, 238, 64, 68, 2, 192, 0, 0, 44, 3, 238, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, 192, 68, 3, 192, 63, 192, 60, 0, 79, 0, 0, 0, 0, 0, 0, 73, 192, 68, 3, 192, 63, 192, 60, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, 56, 3, 64, 124, 32, 52, 0, 119, 0, 0, 0, 0, 0, 0, 112, 0, 56, 3, 64, 124, 32, 52, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 3, 64, 80, 32, 52, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 16, 3, 64, 80, 32, 52, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 64, 248, 16, 36, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 64, 248, 16, 36, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 192, 192, 16, 44, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 2, 192, 192, 16, 44, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 2, 192, 255, 240, 44, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 2, 192, 255, 240, 44, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 3, 192, 41, 64, 60, 48, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 3, 192, 41, 64, 60, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 3, 192, 41, 64, 60, 32, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 3, 192, 41, 64, 60, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 16, 3, 64, 47, 64, 52, 56, 0, 0, 0, 0, 0, 8, 0, 0, 8, 16, 3, 64, 47, 64, 52, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 42, 40, 2, 127, 224, 127, 230, 47, 7, 0, 0, 0, 0, 42, 0, 0, 42, 40, 2, 127, 224, 127, 230, 47, 7, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 20, 40, 3, 118, 227, 109, 180, 97, 159, 0, 0, 0, 0, 20, 0, 0, 20, 40, 3, 118, 227, 109, 180, 97, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 3, 64, 32, 64, 52, 97, 227, 0, 0, 0, 0, 0, 0, 0, 0, 68, 3, 64, 32, 64, 52, 97, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 3, 255, 255, 255, 252, 115, 130, 0, 0, 0, 0, 0, 0, 0, 0, 124, 3, 255, 255, 255, 252, 115, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 192, 0, 0, 60, 127, 198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 192, 0, 0, 60, 127, 198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, 112, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, 112, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 132, 0, 0, 112, 195, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 132, 0, 0, 112, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 126, 0, 0, 120, 0, 0, 57, 129, 0, 0, 0, 0, 0, 0, 0, 40, 126, 0, 0, 120, 0, 0, 57, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 252, 0, 0, 3, 240, 0, 31, 193, 0, 0, 0, 0, 0, 0, 0, 43, 252, 0, 0, 3, 240, 0, 31, 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 134, 0, 0, 2, 16, 0, 7, 227, 0, 0, 0, 0, 0, 0, 0, 21, 134, 0, 0, 2, 16, 0, 7, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 6, 0, 0, 1, 224, 0, 1, 254, 0, 0, 0, 0, 0, 0, 0, 23, 6, 0, 0, 1, 224, 0, 1, 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 62, 0, 0, 252, 0, 0, 0, 195, 0, 0, 0, 0, 0, 0, 0, 15, 62, 0, 0, 252, 0, 0, 0, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 250, 0, 0, 132, 0, 0, 3, 138, 0, 0, 0, 0, 0, 0, 0, 14, 250, 0, 0, 132, 0, 0, 3, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 190, 0, 0, 120, 0, 0, 2, 46, 0, 0, 0, 0, 0, 0, 0, 6, 190, 0, 0, 120, 0, 0, 2, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 156, 0, 0, 3, 240, 0, 3, 238, 0, 0, 0, 0, 0, 0, 0, 3, 156, 0, 0, 3, 240, 0, 3, 238, 0, 0, 0, 0 };
+
+static const uint8_t screen[460] = { 0, 0, 0, 2, 0, 23, 224, 15, 0, 0, 0, 0, 0, 2, 16, 127, 192, 31, 192, 0, 0, 0, 0, 1, 144, 127, 128, 24, 39, 0, 0, 0, 0, 7, 216, 127, 128, 56, 24, 128, 0, 0, 14, 4, 28, 127, 128, 48, 0, 0, 0, 0, 49, 4, 30, 127, 128, 112, 0, 0, 0, 0, 65, 28, 63, 127, 129, 240, 0, 0, 0, 0, 128, 224, 31, 127, 135, 240, 0, 0, 0, 1, 0, 0, 7, 95, 255, 224, 0, 0, 0, 1, 0, 0, 3, 64, 255, 224, 0, 0, 0, 0, 128, 0, 3, 0, 127, 224, 0, 0, 0, 0, 128, 0, 3, 192, 31, 224, 0, 0, 0, 1, 0, 0, 3, 128, 15, 224, 0, 0, 0, 2, 0, 0, 3, 192, 15, 224, 0, 0, 0, 4, 0, 0, 7, 192, 31, 240, 0, 0, 0, 200, 0, 0, 15, 192, 71, 240, 32, 0, 1, 48, 0, 15, 255, 192, 131, 252, 48, 0, 2, 0, 0, 48, 127, 64, 131, 255, 48, 0, 2, 0, 0, 192, 127, 65, 195, 255, 240, 0, 4, 0, 3, 128, 127, 65, 255, 159, 240, 0, 4, 0, 6, 128, 111, 73, 255, 15, 240, 0, 4, 0, 12, 128, 111, 33, 255, 15, 208, 0, 6, 0, 24, 128, 111, 9, 255, 31, 24, 0, 1, 0, 16, 64, 111, 97, 255, 254, 28, 0, 1, 0, 62, 32, 110, 75, 195, 252, 63, 128, 1, 0, 33, 16, 110, 239, 131, 248, 127, 128, 1, 0, 64, 139, 174, 207, 135, 248, 193, 128, 2, 0, 64, 68, 108, 175, 129, 241, 4, 128, 2, 0, 64, 36, 44, 175, 192, 242, 9, 0, 2, 0, 128, 36, 36, 191, 192, 112, 18, 0, 14, 0, 128, 38, 64, 191, 224, 48, 4, 0, 8, 0, 128, 115, 229, 190, 48, 32, 0, 0, 8, 0, 128, 142, 61, 248, 6, 32, 0, 128, 8, 0, 129, 14, 71, 192, 7, 224, 3, 128, 8, 0, 130, 8, 199, 140, 7, 224, 7, 0, 14, 0, 130, 0, 195, 140, 15, 224, 12, 0, 9, 0, 159, 0, 195, 252, 31, 240, 96, 0, 17, 128, 225, 128, 195, 192, 127, 63, 0, 128, 17, 224, 193, 225, 195, 255, 252, 56, 0, 128, 33, 248, 193, 135, 103, 255, 224, 112, 1, 128, 161, 135, 199, 156, 127, 131, 128, 240, 3, 128, 65, 3, 255, 184, 102, 3, 193, 240, 15, 128, 67, 15, 14, 188, 78, 3, 255, 240, 63, 128, 231, 30, 28, 96, 124, 7, 255, 252, 127, 128, 241, 252, 28, 97, 252, 63, 223, 255, 31, 128, 224, 255, 135, 224, 255, 135, 143, 254, 15, 128 };
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wparentheses"
+#pragma GCC diagnostic ignored "-Wshift-negative-value"
+#pragma GCC push_options
+#pragma GCC optimize 0
+
+#define	ML_vram_adress	display_getCurrentVRAM
+__attribute__((optimize("0")))
+void ML_bmp_or_cl(const unsigned char *bmp, int x, int y, int width, int height)
+{
+	uint16_t line;
+	char shift, *screen;
+	uint8_t *p;
+	int i, j, real_width, begin_x, end_x, begin_y, end_y;
+	int bool1=1, bool2=1, bool3;
+	if(!bmp || x<1-width || x>127 || y<1-height || y>63 || height<1
+		|| width<1) return;
+	p = (uint8_t *)&line;
+	real_width = (width-1>>3<<3)+8;
+	if(y < 0) begin_y = -y;
+	else begin_y = 0;
+	if(y+height > 64) end_y = 64-y;
+	else end_y = height;
+	shift = 8-(x&7);
+	if(x<0)
+	{
+		begin_x = -x>>3;
+		if(shift != 8) bool1 = 0;
+	} else begin_x = 0;
+	if(x+real_width > 128) end_x = 15-(x>>3), bool2 = 0;
+	else end_x = real_width-1>>3;
+	bool3 = (end_x == real_width-1>>3);
+	screen = (char *)ML_vram_adress()+(y+begin_y<<4)+(x>>3);
+
+	for(i=begin_y ; i<end_y ; i++)
+	{
+		if(begin_x < end_x)
+		{
+			line = bmp[i*(real_width>>3)+begin_x] << shift;
+			if(bool1) screen[begin_x] |= *p;
+			if(shift!=8) screen[begin_x+1] |= *(p+1);
+			for(j=begin_x+1 ; j<end_x ; j++)
+			{
+				line = bmp[i*(real_width>>3)+j] << shift;
+				screen[j] |= *p;
+				if(shift!=8) screen[j+1] |= *(p+1);
+			}
+		}
+		line = bmp[i*(real_width>>3)+end_x];
+		if(bool3) line &= -1<<real_width-width;
+		line <<= shift;
+		if(begin_x < end_x || bool1) screen[end_x] |= *p;
+		if(bool2) screen[end_x+1] |= *(p+1);
+		screen += 16;
+	}
+}
+#pragma GCC pop_options
+#pragma GCC diagnostic pop
+
+void perf_bopti(void)
+{
+	uint32_t time1 = 0x836e, time2 = 0x743;
+	int i;
+	timer_t *t;
+
+	/* Settings */
+	extern image_t res_town;
+	image_t *img = &res_town;
+	uint8_t *ml_img = town;
+	int x = -60;
+	int y = -28;
+	int w = 284;
+	int h = 124;
+
+
+	dclear();
+	ML_bmp_or_cl(ml_img, x, y, w, h);
+	dupdate();
+	getkey();
+
+	dclear();
+	dimage(x, y, img);
+	dupdate();
+	getkey();
+
+	dclear();
+	dtext(2, 2, "ML...");
+	dupdate();
+
+	t = htimer_setup(timer_user, 0xffffffff, timer_Po_4, 1);
+	timer_start(t);
+	for(i = 0; i < 1000; i++) ML_bmp_or_cl(ml_img, x, y, w, h);
+	time1 = TMU.timers[timer_user]->TCNT;
+	timer_stop(t);
+	time1 = 0xffffffff - time1;
+
+	dclear();
+	dtext(2, 2, "gint...");
+	dupdate();
+
+	t = htimer_setup(timer_user, 0xffffffff, timer_Po_4, 1);
+	timer_start(t);
+	for(i = 0; i < 1000; i++) dimage(x, y, img);
+	time2 = TMU.timers[timer_user]->TCNT;
+	timer_stop(t);
+	time2 = 0xffffffff - time2;
+
+	dclear();
+	print(1, 1, "  ML: %08x", time1);
+	print(1, 2, "gint: %08x", time2);
+	print(1, 3, ">> \x04%d", time1 / time2);
+	dupdate();
+	getkey();
+}
diff --git a/demo/resources/opt_bitmap.bmp b/demo/resources/opt_bitmap.bmp
index c776021b3647f47a5038217020d133593164f535..d8107170fec8ce5d1c9fd0c222710acad8248e15 100644
GIT binary patch
literal 3194
zcmd6ju@1s83`7GH5^OAdPZuT@zJrae6Cc=rf-9#!SxJQmVTh%)=d*o@Z@7$y^o~*A
zo6bXLr?W{XeHE%7_dX_48qU}Ig1`N5%f@G0l!Bj`^0w*MK<Zb4>5mFXRRMYBegjgG
zU;)Rf@=~1tG(eV2Y;&~-_uAjUrd0qp3`ixCF|ib{5KnkYX&fh|%?u*#yZ4~LI#mEG
za4A|BF`b#dc*6Zk<DmQL0ie@^d+l#voebEGRTD%~HLyA6VKTui^$3HmlE!L=(P`hk
z2L;xNfR!OLMyX2%q$0rr4n!hYiu2!70Mgh4Mx+P#+TXxB05&y<{3?d50`V3GAxow#
dweQ}80-II=+^7ZIQaeaL3O%^j{sz{m0xzeEs$~EG

literal 3194
zcmd6jJ5B>Z5JcBRmP|(C^Ee?Q;T&XSj(l@d@)J+3*$*rOtXtZ4O?6FmjZZJ<$Kh7z
z^tXJMeEWR6;h3Jv{OQ04F$|~Y*Y{8S-QS0?@Y+{n!)2y#+h5&Y&ODy}R*pDh1@IVB
z96(Jj%}B8_0V6bAuXxgM6Vg;Bhw;cm=!*NJYUMgT8%Cu9K$U%oBcK|S&5ucy47E3}
zGqxH)XL3!nZDPo)Y&I&GyC@Hco@#uyJtmSlCvnXTuFQ|av#YL#(OkjY3iZ`w4r8nN
zoag`ZKGSS4c6px0k!ep_9RMELf^$e}a#2R|;DwG4-COqn7BVNEvB3?~lb^l)4(4xw
oQC(5rBDp#6f2i>)<{@;%OgodiVl8m*+KcLSxCdaWwV*Tn2U6elvj6}9

diff --git a/demo/resources/opt_gray.bmp b/demo/resources/opt_gray.bmp
index 6d60c629e12bd18b8ed326cf8b6053caad073652..80e5c36689700cd2f51ee19e19572b287b034678 100644
GIT binary patch
delta 360
zcmZvYv1$TA5Qf>k+dXI9u;Jk3AP-<;AwrsvLaq`5M_xcHTfr`nO2UC43b*_(Vj-jw
z?+F5VgH&nLUzIscKtqa!-TC*Qf4-^HI^7NhUPOl4^f4E)FMGZ;sH8^6IE<A;p<*n^
zVkk5w#-fxvOv40gO)&g^qu8$ozpjz8c&8g|6kWKk!yN*Z!m;jH8%ygK_t;B9W9f3x
zm7%5??u5ky*Ej0*%%YJi@=qfi0^+OwKPCE`LYRq!sc?|d4^o29Am_40)hh7JXdk3O
sjCmUD%wqiV)|Vl(6C$&};Ldr(FLFor=11Q@60eX@wKF~iuQWS}-*KpGtN;K2

literal 3194
zcmd6jJx;_>41@#KO3=}8o^7aTI0qfwRvd8e#Ey30)5y*~ksy>jDbCm)kAIG@r^o5~
zPO|U%KJ^{+-A&K3ddfdN_;X;IjxTQ?Klr!*`%e7&+v|ekNbff0_w0WtoY%fS%%X_4
zGan$=n8>V4m!yGHL_t3Xg{d{@*}^G=lBE~=CS+CTxHWd|`Ohe<1MC8jPR?JpAWJ*Q
zq+CLL)}`E4N$xsUfQgGpZvi>g61yV`JGsB7N}Dqqm&ub%N}yo7*YLMtcl)^6vGCIs
zri8d_opLZaU7742?q9~XTV}>(a;ivqapD8lA||+;D%@M;X3i=g0<c<=E$fKv9`4UD
ztd>J&5T=0R#ZqW+%e79)rskkrDaJ6KC8t_qlTq0G{!FqIaEG!HakjRyX(gMr;LaQ?
ckTsAkQV_cGhWBTfMWF1ssMh3NDQtEB3%4y6QUCw|

diff --git a/demo/resources/opt_menu.bmp b/demo/resources/opt_menu.bmp
index 4d682e41f8ba32f159a4d11eed322f74220e798b..09fd37d17ac8c7d8a6219ed15f477fe9819ab291 100644
GIT binary patch
delta 78
ucmew*@k?TZ1LNc-MyJh9jCK$P6El?2!~zpxgNd-iL^xq0To4A(hzbDZIT$zq

delta 274
zcmaLTF$%&!5Cu>+*&Q=+L0AxS1_cpM5K>xs0k0xk*eDiG{xNJkLJlO@rwDFLLSkd_
zndb3lm^!PoXRf3<%XKGrjZ;KrRJ8-13A5DU%?_)`Ay>tS;NuESOt_H4jTRw{R~(d{
zsM3Tg!#(KGF|pzam6<qr8lZ*Jnd~h#ihog=45lsmSH|HqX6SSoj<<Lii?y<2n>1TF
N@OQ&$UZ6|=fe*(LUBv(Z

diff --git a/demo/resources/screen.bmp b/demo/resources/screen.bmp
index 050825a995dc236695e5926389a04c0d10130388..c6fb2c3ef7332f413ba5e729e523f6c9f6dcf001 100644
GIT binary patch
delta 821
zcmX|9&ui3B5N>LJY};s3n%ZFFCTm~Wutpn}t+r(`t5!v*#A1=PENs={7F~?uuL^~S
zo}_qLJ`WxW-9MlZAs)Q##e-lW|A3H-_guWk*>q{(W!}siX1;Ic+x^i0@hQ7@r+>aL
z{dVcUL+3V~i*$rOqwfUS?NW<1Frlm=b~VfuEI36I^&ty<$bkOPMt#dhGHJsp+=c&!
zK~gk|Y493Kzz1akaXtg*f*A1OV@F13QiGncFgGA0mQ-}!u~s_+eYA<FDMGp=L)utC
zJgp!c`w6LN!GC6g4>SB8p?6b*bm|lM%M!vx0wr5Wq_5<w&{Z=nsjCd}_yNM4(Q3=^
zs?=rT54dQfGi4&2JVaD4!FL%vrht#DX*)^%d=$@{@CQ}YnM`~XNN0NSSsQ+nA(`Gg
z%9~+`o-jC%L?mbT()v7CLQ+%^>)!*OV?w}Zy1!Xd0M9MMJ4q#}be#VIK2u43S5t`{
zG0Td?P(f!?rEzc5yN&%Z1K|}K_jAf=$kawe^wxxHRgWo1qXhLatwP#?zf?gyCBr9Z
z@!U7K*)r9Z;W(_<gYE=3$`P$~n^tQ;T2i}Ha<i2*#T!$)?hzsyUXkwSMARE9+`=ZM
zEu%C4H{h4MycUU<SEUi2uFz7~5Unz}<yx<2t<@e#)f1LUIa?+0#kFAHk%d-U3HGmc
zEfvkykX%0`TSaoCXK(#V<6RIb9?}O%##?`#rs*O{C$B(XIUqS1gr@?3y96)ug%(Up
z8rKlNUx9z#09RfF{;DOwy>AB5Jwu?Vif|+Y{z`*$bAcXc7c`?fBV|?p1<?aW*;&#@
LSwqq!yOIA7;I1j3

literal 32906
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
a**(+uh?<poYj{pPU*LR!^92rifqwvmwMha1

diff --git a/demo/resources/town.bmp b/demo/resources/town.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..6a2e6ff755d69f7869fc20c9cbe1fd6792044d48
GIT binary patch
literal 105770
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
F{vUZB$Z!Av

literal 0
HcmV?d00001

diff --git a/demo/test_bopti.c b/demo/test_bopti.c
index 9b137c8..de1c083 100644
--- a/demo/test_bopti.c
+++ b/demo/test_bopti.c
@@ -19,7 +19,7 @@
 	---------------------------------------------------------
 	zelda.bmp	 86 * 280	Mono		-
 	isometric.bmp	 37 * 27	Mono		Full
-			 		Mono		Greater
+	-		 -		Mono		Greater
 	--------------------------------------------------------- 
 */
 
@@ -60,6 +60,7 @@ static image_t *select(image_t *current)
 		res_swords,
 		res_zelda,
 		res_isometric;
+	extern image_t res_screen;
 
 	struct {
 		image_t *img;
@@ -71,6 +72,7 @@ static image_t *select(image_t *current)
 		{ &res_swords,		"Swords",	"Gray Alpha"	},
 		{ &res_zelda,		"Zelda",	"Mono"		},
 		{ &res_isometric,	"Isometric",	"Mono Alpha"	},
+		{ &res_screen,		"TLT",		"Mono"		},
 		{ NULL,			NULL,		NULL		}
 	};
 
@@ -81,6 +83,7 @@ static image_t *select(image_t *current)
 
 	while(images[items].img) items++;
 
+	keyboard_setRepeatRate(625, 125);
 	gray_start();
 
 	while(1)
@@ -141,8 +144,10 @@ void test_bopti(void)
 	int black_bg = 0;
 	int x = 0, y = 0;
 
+
 	while(1)
 	{
+		keyboard_setRepeatRate(25, 25);
 		if(img && (img->format & channel_light))
 		{
 			gray_start();
@@ -152,8 +157,7 @@ void test_bopti(void)
 			if(img) gimage(x, y, img);
 
 			grect(0, 55, 127, 63, color_white);
-			gimage(0, 56, &res_opt_bitmap);
-			gupdate();
+			gimage_part(0, 56, &res_opt_bitmap, 0, 0, 96, 8);
 		}
 		else if(img)
 		{
@@ -164,8 +168,7 @@ void test_bopti(void)
 			if(img) dimage(x, y, img);
 
 			drect(0, 55, 127, 63, color_white);
-			dimage(0, 56, &res_opt_bitmap);
-			dupdate();
+			dimage_part(0, 56, &res_opt_bitmap, 0, 0, 96, 8);
 		}
 		else
 		{
@@ -174,10 +177,36 @@ void test_bopti(void)
 			dclear();
 			locate(3, 3, "No image selected");
 
-			dimage(0, 56, &res_opt_bitmap);
+			dimage_part(0, 56, &res_opt_bitmap, 0, 0, 96, 8);
 			dupdate();
 		}
 
+		if(img)
+		{
+			int width, height;
+			getwh(img, &width, &height);
+
+			if(x < 0) print(1, 4, "\x01");
+			if(x + width > 128) print(21, 4, "\x02");
+
+			if(img->format & channel_light)
+			{
+				if(y < 0) gimage_part(61, 0, &res_opt_bitmap,
+					122, 0, 6, 8);
+				if(y + height > 64) gimage_part(61, 48,
+					&res_opt_bitmap, 116, 0, 6, 8);
+				gupdate();
+			}
+			else
+			{
+				if(y < 0) dimage_part(61, 0, &res_opt_bitmap,
+					122, 0, 6, 8);
+				if(y + height > 64) dimage_part(61, 48,
+					&res_opt_bitmap, 116, 0, 6, 8);
+				dupdate();
+			}
+		}
+
 		do
 		{
 			leave = 1;
@@ -185,6 +214,7 @@ void test_bopti(void)
 			switch(getkey())
 			{
 			case KEY_EXIT:
+				keyboard_setRepeatRate(625, 125);
 				gray_stop();
 				return;
 
@@ -192,22 +222,14 @@ void test_bopti(void)
 				img = select(img);
 				getxy(img, &x, &y);
 				break;
-			case KEY_F5:
+			case KEY_F2:
 				black_bg = !black_bg;
 				break;
 
-			case KEY_UP:
-				y--;
-				break;
-			case KEY_DOWN:
-				y++;
-				break;
-			case KEY_LEFT:
-				x--;
-				break;
-			case KEY_RIGHT:
-				x++;
-				break;
+			case KEY_UP:	y++; break;
+			case KEY_DOWN:	y--; break;
+			case KEY_LEFT:	x++; break;
+			case KEY_RIGHT: x--; break;
 
 			default:
 				leave = 0;
@@ -216,6 +238,7 @@ void test_bopti(void)
 		while(!leave);
 	}
 
+	keyboard_setRepeatRate(625, 125);
 	gray_stop();
 	return;
 }
diff --git a/demo/test_gray.c b/demo/test_gray.c
index 894aa93..86d7f35 100644
--- a/demo/test_gray.c
+++ b/demo/test_gray.c
@@ -8,10 +8,9 @@
 	Lets the user set the gray delays and see the results.
 */
 
-static void draw(int delay1, int delay2, int selected)
+static void draw(int delay1, int delay2, int selected, int gran)
 {
 	extern image_t res_opt_gray;
-	extern font_t res_font_modern;
 	uint32_t *vl = gray_lightVRAM();
 	uint32_t *vd = gray_darkVRAM();
 
@@ -25,15 +24,16 @@ static void draw(int delay1, int delay2, int selected)
 		vd[offset] = -(i < 32);
 	}
 
-	text_configure(&res_font_modern, color_black);
-	gtext(13, 17, "light");
-	gtext(13, 31, "dark");
+	print(2, 3, "light  %d", delay1);
+	print(2, 4, " dark  %d", delay2);
+	print(2, 6, "Mode: \x04%d", gran);
 
-	text_configure(NULL, color_black);
-	print(4, 4, "%d", delay1);
-	print(4, 6, "%d", delay2);
-
-	locate(3, selected ? 6 : 4, "\x02");
+	int lengths[2] = {
+		4 - (delay1 < 1000),
+		4 - (delay2 < 1000)
+	};
+	print(8, 3 + selected, "\x01");
+	print(9 + lengths[selected], 3 + selected, "\x02");
 
 	gimage(0, 56, &res_opt_gray);
 	gupdate();
@@ -44,6 +44,7 @@ void test_gray(void)
 	int delays[2]; // { light, dark }
 	int key, changed = 1;
 	int selected = 0;
+	int gran = 1;
 
 	gray_getDelays(delays, delays + 1);
 	gray_start();
@@ -53,11 +54,11 @@ void test_gray(void)
 		if(changed)
 		{
 			gray_setDelays(delays[0], delays[1]);
-			draw(delays[0], delays[1], selected);
+			draw(delays[0], delays[1], selected, gran);
 		}
 		changed = 0;
 
-		key = getkey_opt(getkey_repeat_arrow_keys, 25);
+		key = getkey_opt(getkey_default, 25);
 		if(key == KEY_EXIT) break;
 
 		changed = 1;
@@ -65,31 +66,33 @@ void test_gray(void)
 		switch(key)
 		{
 		case KEY_F1:
-			selected = !selected;
-			break;
-		case KEY_F2:
 			delays[0] = 912;
 			delays[1] = 1343;
 			break;
-		case KEY_F3:
+		case KEY_F2:
 			delays[0] = 993;
 			delays[1] = 1609;
 			break;
-		case KEY_F4:
+		case KEY_F3:
 			delays[0] = 860;
 			delays[1] = 1298;
 			break;
+		case KEY_F5:
+			if(gran >= 100) gran = 1;
+			else gran *= 10;
 		case KEY_UP:
-			delays[selected] += 10;
+			selected = 0;
 			break;
 		case KEY_DOWN:
-			if(delays[selected] >= 110) delays[selected] -= 10;
-			break;
-		case KEY_RIGHT:
-			delays[selected]++;
+			selected = 1;
 			break;
 		case KEY_LEFT:
-			if(delays[selected] >= 101) delays[selected]--;
+			if(delays[selected] - gran >= 100)
+				delays[selected] -= gran;
+			break;
+		case KEY_RIGHT:
+			if(delays[selected] + gran < 10000)
+				delays[selected] += gran;
 			break;
 		default:
 			changed = 0;
diff --git a/gscreen.bmp b/gscreen.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..4665fe5e4194ebc789476010d2b7dfa864babd78
GIT binary patch
literal 1150
zcmeH_L2DC16vyA|jAqxCx=WW-F<>P181T4<l}^$jMo@9ZvxtHoDq0Y<hgen{qzMvP
zP{B)!eg>f$L~<#5kopazvK6l>RrDZ^@68HgPaZw^cHd)v^PfMn^JeNN7bMtNpn8Qe
zp;VMej}6i%M)Twm&ib)4*K_gj>&T9&#u!>lnD2YdaM}#4`rygpg&U*Y=atg=oS)8I
zTXp*{tFv>KANFT1uXZ0VS7+xfKO+5RxBseo;9EZb#p2bk%)j&mMk<v~r&lTEx-pqC
z_sx%Kle0DbFTXpGrTYrK)&>oXdsz>__oqM~VqN+{46x;wMcW@*F2;cV{<4&=XZa)P
z+r_eYYyHxd>+H)94q!~S6<?k*<o8XsE+(x15jgP<Hr4zm>&!ZUw5C?F&I_Qw2k<j<
zSUbore~k53Ln)P7CY}6iN%Wfi_`wDAYOL5m;Q(yZ_-@ln`WEqyz+fCMc_EF8l=qK;
z52>e!Wz74>$rNrcx7ZbX#hU%UJFzAdE8bz^voW;Kv0wU*eh>I8#sLxg<<x2GPb`b{
z*7l11`j<+$*}&{>B<>v%J-Z8i90OO&6OOdIjC2zx-$c8WgqV*}H<}nUcYRSuho`uk
j(b^JbOQ9U-Lds_bP(mnyRGRw1s2l_bL=qO(xr;vmxEO@6

literal 0
HcmV?d00001

diff --git a/gscreend.bmp b/gscreend.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..2a4f7c913571047f9d0b215096599188b163d2af
GIT binary patch
literal 1150
zcma)4O=whC6#mY=^JX${CX>uhrvouzz!(yh@{rU{z|w0PTD57bsVxzTJT!zZicZzG
z11)lJ<)$DdmLXOg+mNKQF;I{wg<h%~aTbBLpqNEyp;G7~?nH#w^X4_1K+*F!_uTJ(
z=iPh$M&CXgLtD<u`mrdB8c~w3EyCwhk%lLsj=ni@IwGHcRhwLcAdt6o@H9FX1kAjn
zt{;o=?A;JgsOGf@FW$7k#Sc_-f!hbo8*9KfE5b*3HpKG(_WyA6reKD;emvqY-}QkY
z_%jG190bB|78lxL880D^*yG|Ca6oG~iWfP}@u}{|NHHy88htj+G~6+XUW+<<&|~x(
z)jQS!i!r2-G+3gk7>C#QBZsuX1?pEO#9PpZ1fz;ovLSv>(c#@d+msN8Vl+^SOrcBS
zG&qPY+%|6FT*wY0V{p|D!qIy}wt&R<_@rE@sdHA?b=T8}dB}77Y1ACz!ak=$J5BMt
zvkTvuA>)pz85GK?G4(elOtI|D(J5p?^C@<kl&@CtHS$)k;%5|0C+DZ)KTwXz*Z1M_
zZtiU)9#E&mp+17cTTO07y%Of?(_x9aV6z@|L<80WaT-bBUdV4qf>GJn|G(A1EqFFl
z(pfx2r7C6lheyhpf_{KMxH3pSYTV~{4b$&<V)opYcD=?K*1ymr>@i(Wv4|5$Tbjii
zc(viI;6uEQtfk$wiYtC%5uf2Q4;WR`Mf}wm`Ar66#_m|owD2RoGTA1Qe9AA?I_7DJ
z4>VF25wqmst@wNTwte|vm&>XuPkv5!SoxX7q+_Upadbv*Qiul5V*puU#ceyN8!dT4
z`sj&U7Px?6sf?C+l0lLZRgp#lG7420B-uPmbV+<YKOGH@2R(;*j5OS;`W6cq0<~}i
zePw4^y7E3=V60=SjH@bPPFUBcNeM5>s)k7v;Vi3hyo;QTEzwUn$vt&7k0YG(V|5z9
q{<YjVUBa;4<~c3;6=zm@r=|7EuhjLt<QV@_Qgfoz^60jD7yS#$*VPpO

literal 0
HcmV?d00001

diff --git a/gscreenl.bmp b/gscreenl.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..e10ea7cdb0fa4fcf5cfda049ec6e8c6970df347c
GIT binary patch
literal 1150
zcma)5OK2295Pj7>?qt`^Xg<0d*-aJ=VnV<bf^10CK^EMDpBO}t1Y8tF#6$d`Q8X5M
z$wdenB?g5MK_wS+5Px`R(L=-!5fnso7>S=8JVXd6B8)XVdJ#lxsIGbSYPzedYSwP(
zwNR2?S@(&us4GhHltlQdxuFK0K-aG8I2e-uzp6h%eczX}wErXY3jzi<s#`lkJoF^M
z9cuJOh_Bx>!1=9e^ct5Oqjx>v!i4Z49tyC0-}noU-V@AFw|0j7<tIhJ_osY6#J(^5
zpW;9ne8Xx~!0M^(gbm7IH)=S_k@{30VodGWi-cRwR2?rM?P3~fB#icGFg^nqbfFwk
zg9$orF+`fM5M?gLs7adur%(%<(Tzze;lTGFqJzDGl1U;0&G3*6O=_OxX=KZ4E*Zx<
z&BEpoGk9lmu+@WrO<~RyHfK^j`m`(TjFVM|xMj?#r-x=grwaBmTI1Fg>_$wP7S}nX
z2T(Wc+|;jd(9{jvFX=m?!;vlY7;VP!^nDB=ZFCzxNg3vG)%(a9N-%l)C>(C(T5rxX
zDwjOe9l7svcfo}E8r-u;UC>-@5?RWH1NIceaYTXffd4I0qulTJzgwxtLu8GU)D@CP
zu3Iy1aDx|1skgYo%W~vl8z;Q-HrkFirg>JHyM$w`p3`kKxpR->4vryis8_nY!n4Pu
zeVb6>(n5NPb47a)2QbMijk>N+;lpstQ)%|B+xpFUgfIAP>aL=U4`h;i%0_6Kj}@JB
zuw9yuPWy#^<gUs(QC3;>;RKDd$~c2j%g{LTG9gwFwjQd8K`ch4uoAWu)Q(x1y)+A(
z#{!@q%~BbeoPN{?CF({Tb}$M-JLTnHqLUJvEyhtAoGjFRd_;ribn8n}uNFu%P9jmX
z$7vEr<XntlIbyDw#%Hv`@u(o_#aZn^0hO>`t2}n0#<lus0K2%RPmiF7t1^*38o@qq
mQJyZM*<Ce1lBX9q+@9V6ORkm+!phig3x2EcY87&bK8v3tjN_gF

literal 0
HcmV?d00001

diff --git a/include/bfile.h b/include/bfile.h
new file mode 100644
index 0000000..81c0599
--- /dev/null
+++ b/include/bfile.h
@@ -0,0 +1,74 @@
+//---
+//
+//	gint core module: BFile interface
+//
+//	Syscall-based interface to the BFile driver (which I would never dare
+//	to re-write considering how much the storage memory filesystem is an
+//	awful mess).
+//
+//---
+
+#ifndef	_BFILE_H
+#define	_BFILE_H
+
+/*
+	BFile_Remove()
+	Remove a file from the filesystem. The path must be encoded as two-byte
+	fontcharacters!
+*/
+int BFile_Remove(const uint16_t *file);
+
+/*
+	BFile_Create()
+	Creates an entry in the filesystem (two-byte fontcharacter path) of the
+	given type. The size pointer must point to the file size for files, and
+	may be NULL for folders.
+*/
+enum BFile_EntryType
+{
+	BFile_File	= 1,
+	BFile_Folder	= 5,
+};
+int BFile_Create(const uint16_t *file, enum BFile_EntryType type, int *size);
+
+/*
+	BFile_Open()
+	Opens an existing file (two-byte fontcharacter path) with the required
+	mode, and returns a handle (positive integer) on success, or an
+	negative integer on error.
+*/
+enum BFile_OpenMode
+{
+	BFile_ReadOnly	= 0x01,
+	BFile_WriteOnly	= 0x02,
+	BFile_ReadWrite	= BFile_ReadOnly | BFile_WriteOnly,
+};
+int BFile_Open(const uint16_t *file, enum BFile_OpenMode mode);
+
+/*
+	BFile_Close()
+	Closes an open file.
+*/
+int BFile_Close(int handle);
+
+/*
+	BFile_Write()
+	Writes data to a file. The data is taken from the second-argument
+	buffer. The size to write is given as third argument.
+	WARNING: Always write an even number of bytes or you're in for trouble!
+*/
+int BFile_Write(int handle, const void *ram_buffer, int even_size);
+
+/*
+	BFile_Read()
+	Reads from an open file. The second and third arguments indicate where
+	to store data and how much to read. The location from where the data is
+	read depends on the value of `whence`:
+	- If `whence` >= 0, it is considered as the absolute location (in
+	  bytes) of the requested data in the file;
+	- If `whence` == -1, BFile_Read() reads from the current virtual
+	  position in the file.
+*/
+int BFile_Read(int handle, void *ram_buffer, int size, int whence);
+
+#endif	// _BFILE_H
diff --git a/include/internals/syscalls.h b/include/internals/syscalls.h
index ae05b78..594c50b 100644
--- a/include/internals/syscalls.h
+++ b/include/internals/syscalls.h
@@ -1,6 +1,9 @@
 //---
+//
 //	gint core module: syscalls
+//
 //	Some of the functionality still requires interacting with the system.
+//
 //---
 
 #ifndef	_INTERNALS_SYSCALLS_H
diff --git a/include/keyboard.h b/include/keyboard.h
index ea5cd7f..4acb419 100644
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -177,6 +177,9 @@ typedef enum
 	// Shorthand for the four previous properties.
 	getkey_repeat_all_keys		= 0xf0,
 
+	// Default combination of getkey().
+	getkey_default			= 0x1f,
+
 } getkey_option_t;
 
 /*
diff --git a/include/modules/interrupts.h b/include/modules/interrupts.h
index 54b172e..3ffd9d1 100644
--- a/include/modules/interrupts.h
+++ b/include/modules/interrupts.h
@@ -1,5 +1,5 @@
-#ifndef	_MODULES_INTERRUPTS
-#define	_MODULES_INTERRUPTS
+#ifndef	_MODULES_INTERRUPTS_H
+#define	_MODULES_INTERRUPTS_H
 
 #include <modules/macros.h>
 #include <stdint.h>
@@ -685,4 +685,4 @@ typedef union
 // Here's what you'll need to use.
 extern mod_intc_t INTC;
 
-#endif	// _MODULE_INTERRUPTS
+#endif	// _MODULE_INTERRUPTS_H
diff --git a/src/core/syscalls.s b/src/core/syscalls.s
index ad7f984..0ebf0d2 100644
--- a/src/core/syscalls.s
+++ b/src/core/syscalls.s
@@ -22,8 +22,18 @@
 	/* Return to menu */
 	.global	___system_menu
 
+	/* Storage memory filesystem */
+	.global	_BFile_Remove
+	.global	_BFile_Create
+	.global	_BFile_Open
+	.global	_BFile_Close
+	.global	_BFile_Write
+	.global	_BFile_Read
 
 
+
+/* Dynamic memory allocation */
+
 ___malloc:
 	mov.l	syscall_table, r2
 	mov.l	1f, r0
@@ -45,6 +55,8 @@ ___realloc:
 	nop
 1:	.long	0xe6d
 
+/* OS version access */
+
 ___get_os_version:
 	mov.l	syscall_table, r2
 	mov.l	1f, r0
@@ -126,6 +138,58 @@ ___system_menu:
 .memcpy:
 	.long	_memcpy
 
+/* BFile driver */
+
+
+# int BFile_Remove(const uint16_t *file)
+_BFile_Remove:
+	mov.l	1f, r0
+	mov.l	syscall_table, r1
+	jmp	@r1
+	mov	#0, r5
+1:	.long	0x0439
+
+# int BFile_Create(const uint16_t *file, enum { file = 1, folder = 5 },
+# int *size)
+_BFile_Create:
+	mov.l	1f, r0
+	mov.l	syscall_table, r1
+	jmp	@r1
+	nop
+1:	.long	0x0434
+
+# int BFile_Open(const uint16_t *file, int mode)
+_BFile_Open:
+	mov.l	1f, r0
+	mov.l	syscall_table, r1
+	jmp	@r1
+	mov	#0, r6
+1:	.long	0x042c
+
+# int BFile_Close(int handle)
+_BFile_Close:
+	mov.l	1f, r0
+	mov.l	syscall_table, r1
+	jmp	@r1
+	nop
+1:	.long	0x042d
+
+# int BFile_Write(int handle, const void *ram_buffer, int even_size)
+_BFile_Write:
+	mov.l	1f, r0
+	mov.l	syscall_table, r1
+	jmp	@r1
+	nop
+1:	.long	0x0435
+
+# int BFile_Read(int handle, void *ram_buffer, int size, int whence)
+_BFile_Read:
+	mov.l	1f, r0
+	mov.l	syscall_table, r1
+	jmp	@r1
+	nop
+1:	.long	0x0432
+
 
 
 	.align 4
diff --git a/src/gray/grect.c b/src/gray/grect.c
index 0edfb1d..a123d94 100644
--- a/src/gray/grect.c
+++ b/src/gray/grect.c
@@ -20,7 +20,7 @@ void grect(int x1, int y1, int x2, int y2, color_t operator)
 	// Doing things in this order will be slower, but man, I can't stand
 	// writing that many lines of code for such a simple task. It will be
 	// terribly heavy in the binary file...
-	while(lvideo > lbase) for(int i = 0; i < 4; i++) switch(operator)
+	while(lvideo > lbase) for(int i = 3; i >= 0; i--) switch(operator)
 	{
 	case color_white:
 		*--lvideo &= ~masks[i];
diff --git a/src/init/crt0.c b/src/init/crt0.c
index 92ccc69..712fd3c 100644
--- a/src/init/crt0.c
+++ b/src/init/crt0.c
@@ -8,6 +8,7 @@
 #include <display.h>
 #include <internals/init.h>
 #include <internals/modules.h>
+#include <modules/interrupts.h>
 
 /* We need some more functionality to generate these */
 #ifdef	GINT_STARTUP_LOG
@@ -15,7 +16,6 @@
   #include <clock.h>
   #include <events.h>
   #include <internals/keyboard.h>
-  #include <modules/interrupts.h>
 
   #ifndef GINT_NO_SYSCALLS
     #include <internals/syscalls.h>
@@ -226,7 +226,7 @@ __attribute__((section(".pretext.entry"))) int start(void)
 	init();
 
 #ifdef GINT_STARTUP_LOG
-	/* Keep this visible for a second or so */
+	/* Keep this visible if a key is kept pressed */
 	keyboard_interrupt();
 	if(pollevent().type != event_none) getkey();
 #endif
diff --git a/src/keyboard/getkey.c b/src/keyboard/getkey.c
index f75d086..9b1f38b 100644
--- a/src/keyboard/getkey.c
+++ b/src/keyboard/getkey.c
@@ -12,17 +12,7 @@
 */
 int getkey(void)
 {
-	return getkey_opt(
-		getkey_shift_modifier		|
-		getkey_alpha_modifier		|
-		getkey_manage_backlight		|
-#ifndef GINT_NO_SYSCALLS
-		getkey_task_switch		|
-#endif
-		getkey_repeat_arrow_keys,
-
-		0
-	);
+	return getkey_opt(getkey_default, 0);
 }
 
 /*
diff --git a/version b/version
index 8cc1a27..6b8dc6a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-beta-0.9-581
+beta-0.9-584