diff --git a/gen/fontgen.py b/gen/fontgen.py index 846f58d..d3c1cba 100644 --- a/gen/fontgen.py +++ b/gen/fontgen.py @@ -14,6 +14,7 @@ import struct CODEPAGE = { 0: None, 128: 'Ξ', + 129: '\U0001f41d', # bee emoji } for x in range(32, 127): CODEPAGE[x] = chr(x) @@ -81,4 +82,4 @@ with open("xenrom/data/font_table.dat", "wb") as table_file, open("xenrom/data/f data_file.write(data) inc_file.write(f"const FONT_SIZE: {SCALE}\n") - inc_file.write(f"const FONT_LINE_HEIGHT: {8 * SCALE}\n") + inc_file.write(f"const FONT_LINE_HEIGHT: {9 * SCALE}\n") diff --git a/xenrom/main.asm b/xenrom/main.asm index 18b8eb1..bab49dc 100644 --- a/xenrom/main.asm +++ b/xenrom/main.asm @@ -41,7 +41,7 @@ entry: mov r5, 20 ; l mov r6, 620 ; r mov r7, 100000 ; bot - mov r30, 2 + mov r30, 16 mov r31, COLOR_WHITE call draw_str_at @@ -79,7 +79,7 @@ entry: halt -entry_str: data.str "= " data.8 128 data.str "EN32OS =" data.8 10 data.8 0 +entry_str: data.str "= " data.8 128 data.str "EN32OS =" data.8 10 data.8 10 data.8 0 ; defines version_str, sha_str #include "data/version.inc" @@ -88,7 +88,7 @@ version_str_2: data.str " (commit " data.8 0 version_str_3: data.str ")" data.8 10 data.8 0 credit_str_1: data.str "font by " data.8 0 -credit_str_2: data.str "ultlang" data.8 0 +credit_str_2: data.str "ultlang " data.8 129 data.8 0 credit_str_3: data.str ", os by " data.8 0 credit_str_4: data.str "xenia" data.8 0 diff --git a/xenrom/text.asm b/xenrom/text.asm index f3080a0..59c53e9 100644 --- a/xenrom/text.asm +++ b/xenrom/text.asm @@ -192,7 +192,7 @@ font_sleep: ; r0: end time ; r1: current time in r0, 0x8000_0706 ; RTC uptime (ms) - add r0, 30 + add r0, r30 font_sleep_busyloop: in r1, 0x8000_0706 cmp r1, r0