2 files changed, 12 insertions, 2 deletions

diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index ba20d3f59..dc9954377 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -680,11 +680,19 @@ bool Controller_NPad::VibrateControllerAtIndex(std::size_t npad_index,
         return false;
     }
 
+    const auto& player = Settings::values.players.GetValue()[npad_index];
+
+    if (!player.vibration_enabled) {
+        return false;
+    }
+
     using namespace Settings::NativeButton;
     const auto& button_state = buttons[npad_index];
 
     return button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay(
-        vibration_value.amp_low, vibration_value.freq_low, vibration_value.amp_high,
+        std::min(vibration_value.amp_low * player.vibration_strength / 100.0f, 1.0f),
+        vibration_value.freq_low,
+        std::min(vibration_value.amp_high * player.vibration_strength / 100.0f, 1.0f),
         vibration_value.freq_high);
 }
 
@@ -728,7 +736,8 @@ void Controller_NPad::VibrateControllers(const std::vector<DeviceHandle>& vibrat
         }
 
         // Filter out non-zero vibrations that are within 0.015625 absolute amplitude of each other.
-        if ((vibration_values[i].amp_low != 0.0f || vibration_values[i].amp_high != 0.0f) &&
+        if (!Settings::values.enable_accurate_vibrations.GetValue() &&
+            (vibration_values[i].amp_low != 0.0f || vibration_values[i].amp_high != 0.0f) &&
             (latest_vibration_values[npad_index][device_index].amp_low != 0.0f ||
              latest_vibration_values[npad_index][device_index].amp_high != 0.0f) &&
             (abs(vibration_values[i].amp_low -
diff --git a/src/core/settings.h b/src/core/settings.h
index edd2a00ca..476c3fdf3 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -170,6 +170,7 @@ struct Values {
     Setting<bool> use_docked_mode;
 
     Setting<bool> vibration_enabled;
+    Setting<bool> enable_accurate_vibrations;
 
     Setting<bool> motion_enabled;
     std::string motion_device;