diff options
| author | Malkierian <malkierian@gmail.com> | 2024-12-14 14:31:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-14 22:31:10 +0100 |
| commit | 4b07a6f59a54eef14474c061667140112a8e5325 (patch) | |
| tree | 08c46b5e160172e79dca5f9da61172ba6193b572 | |
| parent | e0f25905c2d3f3fbfb2db553e1f18a684b80813a (diff) | |
Re-implement old toggles for Dpad and Right Stick Ocarina Playback. (#4660)
| -rw-r--r-- | soh/soh/Enhancements/controls/SohInputEditorWindow.cpp | 6 | ||||
| -rw-r--r-- | soh/src/code/code_800EC960.c | 34 |
2 files changed, 37 insertions, 3 deletions
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp index 2a555f560..72ec3806b 100644 --- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp @@ -1535,8 +1535,10 @@ void SohInputEditorWindow::DrawMapping(CustomButtonMap& mapping, float labelWidt void SohInputEditorWindow::DrawOcarinaControlPanel() { ImVec2 cursor = ImGui::GetCursorPos(); - ImGui::SetCursorPos(ImVec2(cursor.x + 24, cursor.y + 5)); - + ImGui::SetCursorPos(ImVec2(cursor.x, cursor.y + 5)); + + UIWidgets::EnhancementCheckbox("Dpad Ocarina Playback", CVAR_SETTING("CustomOcarina.Dpad")); + UIWidgets::EnhancementCheckbox("Right Stick Ocarina Playback", CVAR_SETTING("CustomOcarina.RightStick")); UIWidgets::EnhancementCheckbox("Customize Ocarina Controls", CVAR_SETTING("CustomOcarina.Enabled")); if (!CVarGetInteger(CVAR_SETTING("CustomOcarina.Enabled"), 0)) { diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index d8da87bb4..0af2ed9ca 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -26,6 +26,10 @@ #define Audio_SeqCmd8(playerIdx, a, b, c) \ Audio_QueueSeqCmd(0x80000000 | ((u8)playerIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)c)) #define Audio_SeqCmdF(playerIdx, a) Audio_QueueSeqCmd(0xF0000000 | ((u8)playerIdx << 24) | ((u8)a)) +#define BTN_CUSTOM_RSTICK_UP ((CONTROLLERBUTTONS_T)0x01000000) +#define BTN_CUSTOM_RSTICK_DOWN ((CONTROLLERBUTTONS_T)0x02000000) +#define BTN_CUSTOM_RSTICK_LEFT ((CONTROLLERBUTTONS_T)0x04000000) +#define BTN_CUSTOM_RSTICK_RIGHT ((CONTROLLERBUTTONS_T)0x08000000) typedef struct { /* 0x0 */ f32 vol; @@ -1261,13 +1265,26 @@ void Audio_OcaUpdateBtnMap(bool customControls) { sOcarinaA4BtnMap = BTN_CUSTOM_OCARINA_NOTE_A4; sOcarinaF4BtnMap = BTN_CUSTOM_OCARINA_NOTE_F4; sOcarinaD4BtnMap = BTN_CUSTOM_OCARINA_NOTE_D4; - } else { + } + else { sOcarinaD5BtnMap = BTN_CUP; sOcarinaB4BtnMap = BTN_CLEFT; sOcarinaA4BtnMap = BTN_CRIGHT; sOcarinaF4BtnMap = BTN_CDOWN; sOcarinaD4BtnMap = BTN_A; } + if (CVarGetInteger(CVAR_SETTING("CustomOcarina.Dpad"), 0)) { + sOcarinaD5BtnMap |= BTN_DUP; + sOcarinaB4BtnMap |= BTN_DLEFT; + sOcarinaA4BtnMap |= BTN_DRIGHT; + sOcarinaF4BtnMap |= BTN_DDOWN; + } + if (CVarGetInteger(CVAR_SETTING("CustomOcarina.RightStick"), 0)) { + sOcarinaD5BtnMap |= BTN_CUSTOM_RSTICK_UP; + sOcarinaB4BtnMap |= BTN_CUSTOM_RSTICK_LEFT; + sOcarinaA4BtnMap |= BTN_CUSTOM_RSTICK_RIGHT; + sOcarinaF4BtnMap |= BTN_CUSTOM_RSTICK_DOWN; + } sOcarinaAllowedBtnMask = ( sOcarinaD5BtnMap | @@ -1289,6 +1306,21 @@ void Audio_GetOcaInput(void) { sPrevOcarinaBtnPress = sp18; sCurOcaStick.x = input->rel.stick_x; sCurOcaStick.y = input->rel.stick_y; + s8 rstick_x = input->cur.right_stick_x; + s8 rstick_y = input->cur.right_stick_y; + const s8 sensitivity = 64; + if (rstick_x > sensitivity) { + sCurOcarinaBtnPress |= BTN_CUSTOM_RSTICK_RIGHT; + } + if (rstick_x < -sensitivity) { + sCurOcarinaBtnPress |= BTN_CUSTOM_RSTICK_LEFT; + } + if (rstick_y > sensitivity) { + sCurOcarinaBtnPress |= BTN_CUSTOM_RSTICK_UP; + } + if (rstick_y < -sensitivity) { + sCurOcarinaBtnPress |= BTN_CUSTOM_RSTICK_DOWN; + } } f32 Audio_OcaAdjStick(s8 inp) { |