change PostRestoreHold to only fire if restore key is held (#22)

* change PostRestoreHold to only fire if restore key is held instead of any key

* bump version

Author: Pistonight

Taskfile.yml

@@ -32,7 +32,7 @@ tasks:
   package:
     desc: Package the build for release
     vars:
-      VERSION: "SS2.3"
+      VERSION: "SS2.4"
       MOD_DIR: "target/package/mods/The Legend of Zelda - Breath of the Wild/Save State/contents/01007EF00011E000"
     cmds:
       - megaton build -p none

src/core/controller.cpp

@@ -346,8 +346,8 @@ Command Controller::update_setting_mode() {
 Command Controller::update_active_mode() {
     if (m_restore_fired) {
         // after restore, keep firing PostRestoreHold
-        // until all keys are released
-        if (get_hold_keys() != Key::None) {
+        // until all keys in the restore combo are released
+        if ((get_hold_keys() & m_restore_fired_key) != Key::None) {
             return Command::PostRestoreHold;
         }
         m_restore_fired = false;
@@ -359,9 +359,11 @@ Command Controller::update_active_mode() {
         return Command::SaveFile;
     } else if (is_only_holding(m_key_restore)) {
         m_restore_fired = true;
+        m_restore_fired_key = m_key_restore;
         return Command::Restore;
     } else if (is_only_holding(m_key_restore_file)) {
         m_restore_fired = true;
+        m_restore_fired_key = m_key_restore_file;
         return Command::RestoreFile;
     }
     return Command::None;

src/core/controller.hpp

@@ -154,7 +154,13 @@ class Controller {
     Key m_key_save_file = Key::ZL | Key::L | Key::DpadLeft | Key::RStick;
     Key m_key_restore = Key::ZL | Key::L | Key::Plus | Key::DpadRight;
     Key m_key_restore_file = Key::ZL | Key::L | Key::DpadRight | Key::RStick;
+
+    /**
+     * State to track the last restore fired, and keep firing PostRestoreHold
+     * until the user releases the restore key
+     */
     bool m_restore_fired = false;
+    Key m_restore_fired_key = Key::None;
 
     u32 m_tick_since_last_menu_input = MENU_REFRESH_TICKS + 1;
     mem::StringBuffer<MENU_BUFFER_LEN> m_menu_title;