From 3f175c996aa01b7b7650ea2014dbb676305fc428 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Sun, 25 Feb 2024 22:23:49 +0100
Subject: [PATCH] early-access version 4171

---
 README.md                                     | 2 +-
 src/hid_core/frontend/emulated_controller.cpp | 5 ++---
 tools/reset-submodules.sh                     | 8 ++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100755 tools/reset-submodules.sh

diff --git a/README.md b/README.md
index fc3f1ce00..60c9cf79f 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 4170.
+This is the source code for early-access 4171.
 
 ## Legal Notice
 
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 7664341bd..9aa08d5cc 100755
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -176,10 +176,9 @@ void EmulatedController::LoadDevices() {
     if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
         camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
         nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
-#ifdef HAVE_LIBUSB
+#ifndef ANDROID
         ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
-#endif
-#ifdef ANDROID
+#else
         android_params = Common::ParamPackage{"engine:android,port:100"};
 #endif
     }
diff --git a/tools/reset-submodules.sh b/tools/reset-submodules.sh
new file mode 100755
index 000000000..6fdfe0bcd
--- /dev/null
+++ b/tools/reset-submodules.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-License-Identifier: MIT
+
+git submodule sync
+git submodule foreach --recursive git reset --hard
+git submodule update --init --recursive