From b25add65f3a1ef67084104a4e7438051b2a034c0 Mon Sep 17 00:00:00 2001 From: chee Date: Thu, 18 Mar 2021 14:59:33 +0000 Subject: [PATCH] use start as the menu button --- bleepbloopmachine/src/main.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/bleepbloopmachine/src/main.cc b/bleepbloopmachine/src/main.cc index 5299007..879bb7a 100644 --- a/bleepbloopmachine/src/main.cc +++ b/bleepbloopmachine/src/main.cc @@ -440,8 +440,8 @@ class BleepBloopMachine { bool ab_mode = held & PAD_A && held & PAD_B; bool a_mode = !ab_mode && held & PAD_A; bool b_mode = !ab_mode && held & PAD_B; - bool select_mode = !ab_mode && !a_mode && !b_mode && held & PAD_SELECT; - bool none_mode = !ab_mode && !a_mode && !b_mode && !select_mode; + bool start_mode = !ab_mode && !a_mode && !b_mode && held & PAD_START; + bool none_mode = !ab_mode && !a_mode && !b_mode && !start_mode; if (b_mode && released) { ignoreRelease |= PAD_B; @@ -451,13 +451,13 @@ class BleepBloopMachine { ignoreRelease |= PAD_A; } - if (select_mode && released) { - ignoreRelease |= PAD_SELECT; + if (start_mode && released) { + ignoreRelease |= PAD_START; } switch (mode) { case MenuMode::menu1: - if (select_mode) { + if (start_mode) { if (released & PAD_UP && selectedBlockIndex > 0x3) { selectedBlockIndex -= 4; } @@ -483,8 +483,8 @@ class BleepBloopMachine { if (released & PAD_UP) { waveUp(); } - if (released == PAD_SELECT) { - if (!(ignoreRelease & PAD_SELECT)) { + if (released == PAD_START) { + if (!(ignoreRelease & PAD_START)) { menu(MenuMode::menu2); } } @@ -535,7 +535,7 @@ class BleepBloopMachine { } break; case MenuMode::menu2: - if (select_mode) { + if (start_mode) { if (released & PAD_UP && selectedBlockIndex > 0x3) { selectedBlockIndex -= 4; } @@ -561,8 +561,8 @@ class BleepBloopMachine { if (released & PAD_LEFT) { selectedMenu2Control = --selectedMenu2Control; } - if (released == PAD_SELECT) { - if (!(ignoreRelease & PAD_SELECT)) { + if (released == PAD_START) { + if (!(ignoreRelease & PAD_START)) { menu(MenuMode::menu1); } } @@ -617,8 +617,8 @@ class BleepBloopMachine { selectedWave()->sounds[selectedBlockIndex] = clipboard; } } - if (released == PAD_SELECT) { - if (!(ignoreRelease & PAD_SELECT)) { + if (released == PAD_START) { + if (!(ignoreRelease & PAD_START)) { menu(MenuMode::menu1); } } @@ -631,8 +631,8 @@ class BleepBloopMachine { if (released == PAD_A && ignoreRelease & PAD_A) { ignoreRelease ^= PAD_A; } - if (released == PAD_SELECT && ignoreRelease & PAD_SELECT) { - ignoreRelease ^= PAD_SELECT; + if (released == PAD_START && ignoreRelease & PAD_START) { + ignoreRelease ^= PAD_START; } } };