Merge pull request #72 from savaughn/main-menu-clean-up

fixed menu selection off-button bug
savaughn · Nov 2, 2023 · 1f78d20 · 1f78d20
2 parents 882b0f4 + af9429f
commit 1f78d20
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/screens/MainMenuScreen.c b/src/screens/MainMenuScreen.c
@@ -143,10 +143,6 @@ void draw_main_menu(struct SaveFileData *save_file_data, GameScreen *current_scr
     {
         set_active_animation(BUTTON_TRADE);
     }
-    else
-    {
-        clear_active_animation();
-    }
 
     // Update/Draw animated Trade details pane
     if (active_anim_index == BUTTON_TRADE)
@@ -187,10 +183,6 @@ void draw_main_menu(struct SaveFileData *save_file_data, GameScreen *current_scr
     {
         set_active_animation(BUTTON_EVOLVE);
     }
-    else
-    {
-        clear_active_animation();
-    }
 
     // Update/Draw animated Evolve details pane
     if (active_anim_index == BUTTON_EVOLVE)
@@ -225,10 +217,6 @@ void draw_main_menu(struct SaveFileData *save_file_data, GameScreen *current_scr
     {
         set_active_animation(BUTTON_SETTINGS);
     }
-    else
-    {
-        clear_active_animation();
-    }
 
     // Update/Draw animated Settings details pane
     if (active_anim_index == BUTTON_SETTINGS)
@@ -251,10 +239,6 @@ void draw_main_menu(struct SaveFileData *save_file_data, GameScreen *current_scr
     {
         set_active_animation(BUTTON_QUIT);
     }
-    else
-    {
-        clear_active_animation();
-    }
 
     // Update/Draw animated Quit details pane
     if (active_anim_index == BUTTON_QUIT)
@@ -325,4 +309,7 @@ void draw_main_menu(struct SaveFileData *save_file_data, GameScreen *current_scr
     }
 
     EndDrawing();
+
+    // Reset active hover index
+    clear_active_animation();
 }