From d5e94044135f5388953b05cbd65f33bb3de5f4f3 Mon Sep 17 00:00:00 2001 From: Ry Date: Sat, 24 Jun 2023 16:05:17 -0700 Subject: [PATCH] Fix some messed up formatting, add Okameron submodule --- .gitmodules | 3 +++ applications/foxpaint/main.asm | 24 ++++++++++++------------ meta/okameron | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) create mode 160000 meta/okameron diff --git a/.gitmodules b/.gitmodules index 5fc7817..4d531fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "meta/ryfs"] path = meta/ryfs url = https://github.com/ry755/ryfs +[submodule "meta/okameron"] + path = meta/okameron + url = https://github.com/talonfox/okameron diff --git a/applications/foxpaint/main.asm b/applications/foxpaint/main.asm index a494f34..0d60aeb 100644 --- a/applications/foxpaint/main.asm +++ b/applications/foxpaint/main.asm @@ -364,27 +364,27 @@ menu_items_root: menu_items_canvas_name: data.8 6 data.strz "Canvas" ; text length, text, null-terminator menu_items_brush_name: - data.8 5 data.str "Brush" data.8 0x00 ; text length, text, null-terminator + data.8 5 data.strz "Brush" ; text length, text, null-terminator menu_items_canvas_list: - data.8 2 ; number of items - data.8 16 ; menu width (usually longest item + 2) + data.8 2 ; number of items + data.8 16 ; menu width (usually longest item + 2) data.8 14 data.strz "Clear to Black" ; text length, text, null-terminator data.8 14 data.strz "Clear to White" ; text length, text, null-terminator menu_items_brush_list: - data.8 4 ; number of items - data.8 7 ; menu width (usually longest item + 2) - data.8 3 data.str "2x2" data.8 0x00 ; text length, text, null-terminator - data.8 3 data.str "4x4" data.8 0x00 ; text length, text, null-terminator - data.8 3 data.str "8x8" data.8 0x00 ; text length, text, null-terminator + data.8 4 ; number of items + data.8 7 ; menu width (usually longest item + 2) + data.8 3 data.strz "2x2" ; text length, text, null-terminator + data.8 3 data.strz "4x4" ; text length, text, null-terminator + data.8 3 data.strz "8x8" ; text length, text, null-terminator data.8 5 data.strz "16x16" ; text length, text, null-terminator menu_items_color_list: - data.8 5 ; number of items - data.8 7 ; menu width (usually longest item + 2) + data.8 5 ; number of items + data.8 7 ; menu width (usually longest item + 2) data.8 5 data.strz "Black" ; text length, text, null-terminator data.8 5 data.strz "White" ; text length, text, null-terminator - data.8 3 data.str "Red" data.8 0x00 ; text length, text, null-terminator + data.8 3 data.strz "Red" ; text length, text, null-terminator data.8 5 data.strz "Green" ; text length, text, null-terminator - data.8 4 data.str "Blue" data.8 0x00 ; text length, text, null-terminator + data.8 4 data.strz "Blue" ; text length, text, null-terminator is_drawing: data.8 0 brush_size: data.8 4 diff --git a/meta/okameron b/meta/okameron new file mode 160000 index 0000000..ea08b70 --- /dev/null +++ b/meta/okameron @@ -0,0 +1 @@ +Subproject commit ea08b7048ebfbea70229e7b7e8a7cbb46fd08d74