1 files changed, 12 insertions, 37 deletions

diff --git a/src/main.c b/src/main.c
index 62030e5..ea8d459 100644
--- a/src/main.c
+++ b/src/main.c
@@ -124,20 +124,19 @@ file_talk(Device *d, u8 b0, u8 w) {
         u16 result = 0, length = mempeek16(d->dat, 0xa);
         u16 offset = mempeek16(d->dat, 0x4);
         u16 addr = mempeek16(d->dat, b0 - 1);
-        File file = fs_open_file(name, read ? FS_OPEN_READ : FS_OPEN_WRITE);
+        OpenMode mode = FS_OPEN_READ;
+        if (!read) {
+            mode = offset ? FS_OPEN_APPEND : FS_OPEN_WRITE;
+        }
+        File file = fs_open_file(name, mode);
         if (file.index != FS_NULL) {
-            txt_position(9, 9);
-            // TODO: Use file.cur pointer and fs_seek instead of offset.
-            // TODO: Remove append, that should be a write mode.
-            if (read) {
-                result = fs_read(&d->mem[addr], length, offset, &file);
-            } else {
-                result = fs_write(&d->mem[addr], length, offset, offset > 0, &file);
-                txt_printf("WROTE: %d\n", result);
+                        if(fs_seek(&file, offset, SEEK_SET) != -1) {
+                if (read) {
+                    result = fs_read(&d->mem[addr], length, &file);
+                } else {
+                    result = fs_write(&d->mem[addr], length, &file);
+                }
             }
-        } else {
-            // txt_position(9, 9);
-            // txt_printf("NOT FOUND");
         }
                 mempoke16(d->dat, 0x2, result);
         }
@@ -197,7 +196,7 @@ handle_input(Uxn *u) {
             }
 
             // Update ctrl_idx.
-            ctrl_idx = ctrl_idx + 1 > LEN(ctrl_methods) - 1 ? 0 : ctrl_idx + 1;
+            ctrl_idx = (ctrl_idx + 1 > (int)LEN(ctrl_methods) - 1) ? 0 : ctrl_idx + 1;
 
             // Initialize controller variables here.
             if (ctrl_methods[ctrl_idx] == CONTROL_KEYBOARD) {
@@ -360,38 +359,14 @@ int main(void) {
     txt_init(1, TEXT_LAYER);
     txt_position(0,0);
 
-    u8 test_data_a[1020];
-    u8 test_data_b[2038];
-    memset(&test_data_a, 0xAA, sizeof(test_data_a));
-    memset(&test_data_b, 0xbb, sizeof(test_data_b));
-
-    txt_position(0, 8);
-    File file_a = fs_open_file("file_a", FS_OPEN_WRITE);
-    File file_b = fs_open_file("file_b", FS_OPEN_WRITE);
-    fs_write(&test_data_b, sizeof(test_data_b), 0, 0, &file_a);
-    fs_write(&test_data_a, sizeof(test_data_a), 0, 0, &file_a);
-    // fs_write(&test_data_a, sizeof(test_data_a), 0, 0, &file_a);
-    // fs_write(&test_data_b, sizeof(test_data_b), 0, 0, &file_b);
-
     // Main loop.
     int frame_counter = 0;
     evaluxn(&u, 0x0100);
-    u32 flip_cycles = 0;
     while(true) {
         bios_vblank_wait();
-        profile_start();
         handle_input(&u);
-        u32 input_cycles = profile_stop();
-        profile_start();
         evaluxn(&u, mempeek16(devscreen->dat, 0));
-        u32 eval_cycles = profile_stop();
-        txt_position(0, 8);
-        // txt_printf("INPUT: %lu  \n", input_cycles);
-        // txt_printf("EVAL:  %lu  \n", eval_cycles);
-        // txt_printf("FLIP:  %lu  \n", flip_cycles);
-        profile_start();
         flipbuf(&ppu);
-        flip_cycles = profile_stop();
         frame_counter++;
     }