diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 88eda61d..9e931f38 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -1032,11 +1032,11 @@ Result hidSetNpadJoyHoldType(HidJoyHoldType type) { } Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) { - return _hidCmdWithInputU32(122, id); + return _hidCmdWithInputU32(122, hidControllerIDToOfficial(id)); } Result hidSetNpadJoyAssignmentModeDual(HidControllerID id) { - return _hidCmdWithInputU32(124, id); + return _hidCmdWithInputU32(124, hidControllerIDToOfficial(id)); } Result hidMergeSingleJoyAsDualJoy(HidControllerID id0, HidControllerID id1) { @@ -1063,8 +1063,8 @@ Result hidMergeSingleJoyAsDualJoy(HidControllerID id0, HidControllerID id1) { raw->magic = SFCI_MAGIC; raw->cmd_id = 125; - raw->id0 = id0; - raw->id1 = id1; + raw->id0 = hidControllerIDToOfficial(id0); + raw->id1 = hidControllerIDToOfficial(id1); raw->AppletResourceUserId = AppletResourceUserId; rc = serviceIpcDispatch(&g_hidSrv);