1 files changed, 8 insertions, 31 deletions

diff --git a/src/settings.c b/src/settings.c
index d2491b8..eb1393b 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -4,15 +4,6 @@
 static Settings settings = {0};
 static int settings_cursor_loc = 0;
 
-void
-draw_settings_cursor(void) {
-    int x = 6;
-    int y = 17 + settings_cursor_loc * 12;
-    draw_line(x + 1, y + 3, x + 1, y + 7, COL_ACC_0);
-    draw_line(x + 2, y + 4, x + 2, y + 6, COL_ACC_0);
-    draw_line(x + 3, y + 5, x + 3, y + 5, COL_ACC_0);
-}
-
 void serial_irq(void);
 void stop_sound(void);
 void toggle_playing(void);
@@ -62,7 +53,7 @@ set_audio_settings(void) {
 void
 handle_settings_input(void) {
     if (key_tap(KEY_DOWN)) {
-        if (settings_cursor_loc == (N_SETTINGS - 1)) {
+        if (settings_cursor_loc == (SETTINGS_NUM - 1)) {
             settings_cursor_loc = 0;
         } else {
             settings_cursor_loc++;
@@ -71,7 +62,7 @@ handle_settings_input(void) {
     }
     if (key_tap(KEY_UP)) {
         if (settings_cursor_loc == 0) {
-            settings_cursor_loc = N_SETTINGS - 1;
+            settings_cursor_loc = SETTINGS_NUM - 1;
         } else {
             settings_cursor_loc--;
         }
@@ -79,7 +70,7 @@ handle_settings_input(void) {
     }
     if (key_tap(KEY_R)) {
         switch (settings_cursor_loc) {
-            case 0: {
+            case SETTINGS_SYNC: {
                 if ((settings.sync + 1) >= SYNC_NUM) {
                     settings.sync = 0;
                 } else {
@@ -87,7 +78,7 @@ handle_settings_input(void) {
                 }
                 set_audio_settings();
             } break;
-            case 1: {
+            case SETTINGS_THEME: {
                 if ((settings.theme + 1) >= THEME_NUM) {
                     settings.theme = 0;
                 } else {
@@ -95,14 +86,7 @@ handle_settings_input(void) {
                 }
                 swap_palette(settings.theme);
             } break;
-            case 2: {
-                if ((settings.cursor + 1) >= CURSOR_NUM) {
-                    settings.cursor = 0;
-                } else {
-                    settings.cursor++;
-                }
-            } break;
-            case 3: {
+            case SETTINGS_HELP: {
                 if ((settings.help + 1) >= HELP_NUM) {
                     settings.help = 0;
                 } else {
@@ -115,7 +99,7 @@ handle_settings_input(void) {
     }
     if (key_tap(KEY_L)) {
         switch (settings_cursor_loc) {
-            case 0: {
+            case SETTINGS_SYNC: {
                 if (settings.sync == 0) {
                     settings.sync = SYNC_NUM - 1;
                 } else {
@@ -123,7 +107,7 @@ handle_settings_input(void) {
                 }
                 set_audio_settings();
             } break;
-            case 1: {
+            case SETTINGS_THEME: {
                 if (settings.theme == 0) {
                     settings.theme = THEME_NUM - 1;
                 } else {
@@ -131,14 +115,7 @@ handle_settings_input(void) {
                 }
                 swap_palette(settings.theme);
             } break;
-            case 2: {
-                if (settings.cursor == 0) {
-                    settings.cursor = CURSOR_NUM - 1;
-                } else {
-                    settings.cursor--;
-                }
-            } break;
-            case 3: {
+            case SETTINGS_HELP: {
                 if (settings.help == 0) {
                     settings.help = HELP_NUM - 1;
                 } else {