summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
authoraMannus <mannusmenting@gmail.com>2023-03-13 11:37:50 +0100
committerGitHub <noreply@github.com>2023-03-13 11:37:50 +0100
commit866882e4c6c931065c646f3b279f2ac204f54b0d (patch)
treebc5bcab628438cd60af2d709532c5768a327d114 /soh/src/code
parent76e99ffe1919280ef307102cfda7eaf3cce89f9b (diff)
CrowdControl V2: Effect Overhaul (#2433)
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/padmgr.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index 6521ff3aa..cfc0c05b5 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -233,6 +233,12 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
input->cur.button &= ~(BTN_Z);
}
+ uint32_t emulatedButtons = GameInteractor_GetEmulatedButtons();
+ if (emulatedButtons) {
+ input->cur.button |= emulatedButtons;
+ GameInteractor_SetEmulatedButtons(0);
+ }
+
if (GameInteractor_ReverseControlsActive()) {
if (input->cur.stick_x == -128) {
input->cur.stick_x = 127;