Merge b9a7b81a1c into 4abd0fe720

src/game/input.cpp

@@ -54,6 +54,9 @@ enum class InputType {
 };
 
 void set_scanned_input(recomp::InputField value) {
+    if (value.input_type == 4) {
+        printf("scanned input for analog");
+    }
     scanning_device.store(recomp::InputDevice::COUNT);
     scanned_input.store(value);
 }

src/ui/ui_config.cpp

@@ -164,6 +164,21 @@ static bool cont_active = true;
 static recomp::InputDevice cur_device = recomp::InputDevice::Controller;
 
 void recomp::finish_scanning_input(recomp::InputField scanned_field) {
+	if (scanned_input_index == static_cast<int>(GameInput::ACCEPT_MENU) && (
+			// scanned_field.input_type == 4 /* magic number: InputType::ControllerAnalog */ || (
+			// https://github.com/Zelda64Recomp/Zelda64Recomp/issues/411
+				scanned_field.input_type == 3 /* magic number: InputType::ControllerDigital */ && (
+					scanned_field.input_id == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP ||
+					scanned_field.input_id == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN ||
+					scanned_field.input_id == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT ||
+					scanned_field.input_id == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT
+				)
+			// )
+		)) {
+		start_scanning_input(cur_device);
+		return;
+	}
+
     recomp::set_input_binding(static_cast<recomp::GameInput>(scanned_input_index), scanned_binding_index, cur_device, scanned_field);
 	scanned_input_index = -1;
 	scanned_binding_index = -1;