Update

Core/Config.cpp

@@ -452,7 +452,7 @@ static ConfigSetting generalSettings[] = {
 	ConfigSetting("GridView2", &g_Config.bGridView2, true),
 	ConfigSetting("GridView3", &g_Config.bGridView3, false),
 	ConfigSetting("ComboMode", &g_Config.iComboMode, 0),
-	ConfigSetting("RightAnalogMode", &g_Config.iRightAnalogMode, 1), // Default to D-Pad?
+	ConfigSetting("RightAnalogMode", &g_Config.iRightAnalogMode, 0),
 	ConfigSetting("RightAnalogPress", &g_Config.iRightAnalogPress, 0),
 
 	// "default" means let emulator decide, "" means disable.

UI/GameSettingsScreen.cpp

@@ -588,14 +588,6 @@ void GameSettingsScreen::CreateViews() {
 		static const char *touchControlStyles[] = {"Classic", "Thin borders", "Glowing borders"};
 		View *style = controlsSettings->Add(new PopupMultiChoice(&g_Config.iTouchButtonStyle, co->T("Button style"), touchControlStyles, 0, ARRAY_SIZE(touchControlStyles), co->GetName(), screenManager()));
 		style->SetEnabledPtr(&g_Config.bShowTouchControls);
-
-		// Right analog config
-		static const char *rightAnalogModes[] = {"Right analog", "D-Pad", "Face button"};
-		View *rightAnalog = controlsSettings->Add(new PopupMultiChoice(&g_Config.iRightAnalogMode, co->T("Right analog mode"), rightAnalogModes, 0, ARRAY_SIZE(rightAnalogModes), co->GetName(), screenManager()));
-		rightAnalog->SetEnabledPtr(&g_Config.bShowTouchControls);
-		static const char *rightAnalogButton[] = {"Disabled", "Left trigger", "Right trigger", "Square", "Triangle", "Circle", "Cross", "Up", "Down", "Left", "Right", "Start", "Select"};
-		View *rightAnalogPress = controlsSettings->Add(new PopupMultiChoice(&g_Config.iRightAnalogPress, co->T("Right analog button on press"), rightAnalogButton, 0, ARRAY_SIZE(rightAnalogButton), co->GetName(), screenManager()));
-		rightAnalogPress->SetEnabledPtr(&g_Config.bShowTouchControls);
 	}
 
 #ifdef _WIN32

UI/GamepadEmu.cpp

@@ -413,7 +413,6 @@ void PSPStick::Touch(const TouchInput &input) {
 }
 
 void PSPStick::ProcessTouch(float x, float y, bool down) {
-	int rightAnalogMode = g_Config.iRightAnalogMode - 1; // 0 is the right analog mode
 	static const int analogButton[2][4] = {{CTRL_RIGHT, CTRL_DOWN, CTRL_LEFT, CTRL_UP},{CTRL_CIRCLE, CTRL_CROSS, CTRL_SQUARE, CTRL_TRIANGLE}};
 	static const int button[16] = {CTRL_LTRIGGER, CTRL_RTRIGGER, CTRL_SQUARE, CTRL_TRIANGLE, CTRL_CIRCLE, CTRL_CROSS, CTRL_UP, CTRL_DOWN, CTRL_LEFT, CTRL_RIGHT, CTRL_START, CTRL_SELECT};
 
@@ -436,6 +435,7 @@ void PSPStick::ProcessTouch(float x, float y, bool down) {
 		dy = std::min(1.0f, std::max(-1.0f, dy));
 
 		if(stick_ == 2) { // Custom right analog
+			int rightAnalogMode = g_Config.iRightAnalogMode - 1; // 0 is the right analog mode
 			if(dx > 0.5f)
 				__CtrlButtonDown(analogButton[rightAnalogMode][0]);
 			else
@@ -460,6 +460,7 @@ void PSPStick::ProcessTouch(float x, float y, bool down) {
 		__CtrlSetAnalogY(-dy, stick_);
 	} else {
 		if(stick_ == 2) { // Custom right analog
+			int rightAnalogMode = g_Config.iRightAnalogMode - 1; // 0 is the right analog mode
 			__CtrlButtonUp(analogButton[rightAnalogMode][0]);
 			__CtrlButtonUp(analogButton[rightAnalogMode][1]);
 			__CtrlButtonUp(analogButton[rightAnalogMode][2]);

UI/TouchControlVisibilityScreen.cpp

@@ -111,6 +111,13 @@ void TouchControlVisibilityScreen::CreateViews() {
 		row->Add(choice);
 		grid->Add(row);
 	}
+
+	static const char *rightAnalogModes[] = {"Right analog", "D-Pad", "Face button"};
+	View *rightAnalog = vert->Add(new PopupMultiChoice(&g_Config.iRightAnalogMode, co->T("Right analog mode"), rightAnalogModes, 0, ARRAY_SIZE(rightAnalogModes), co->GetName(), screenManager()));
+	rightAnalog->SetEnabledPtr(&g_Config.touchRightAnalogStick.show);
+	static const char *rightAnalogButton[] = {"Disabled", "Left trigger", "Right trigger", "Square", "Triangle", "Circle", "Cross", "Up", "Down", "Left", "Right", "Start", "Select"};
+	View *rightAnalogPress = vert->Add(new PopupMultiChoice(&g_Config.iRightAnalogPress, co->T("Right analog button on press"), rightAnalogButton, 0, ARRAY_SIZE(rightAnalogButton), co->GetName(), screenManager()));
+	rightAnalogPress->SetEnabledPtr(&g_Config.touchRightAnalogStick.show);
 }
 
 void TouchControlVisibilityScreen::onFinish(DialogResult result) {