[Switch] support eight controllers not just four

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
 set(VERSION_MAJOR 1)
-set(VERSION_MINOR 81)
+set(VERSION_MINOR 82)
 
 if(BUILD_PSP2)
 if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)

README.MD

@@ -1,13 +1,8 @@
 Changes in this Version
 ======
-1.81
+1.82
 
-- allow higher CPU speed hack (for Alien Breed 3D)
-- allow optional custom kickstart named kickcustom.rom (for 3.1.4 etc.)
-- buttons can now be mapped to quickload/quicksave for fast savestates 
-- a button can be mapped to "fast mouse", hold it down to speed up mouse
-- "slow mouse" or "fast mouse" buttons now also affect touch and real mice
-- populate custom controls with sensible defaults instead of all blank
+- support up to eight controllers on Switch
 
 Description
 =====
@@ -23,7 +18,7 @@ Thanks to ScHlAuChi for extensive testing, ideas, and for contributing the new l
 
 Thanks to the original authors Chui, john4p, TomB, notaz, Bernd Schneider, Toni Wilen, Pickle, smoku, AnotherGuest, Anonymous engineer, finkel, Lubomyr, pelya and many more.
 
-Thanks to my supporters on Patreon: Andyways, CountDuckula, Jesse Harlin, Özgür Karter, Matthew Machnee, and RadicalR.
+Thanks to my supporters on Patreon: Andyways, CountDuckula, Greg Gibson, Jesse Harlin, Özgür Karter, Matthew Machnee, and RadicalR.
 
 Installation
 ======
@@ -55,12 +50,12 @@ Vita/Switch-exclusive Features
 ======
 - Full speed emulation of most Amiga games with zero frameskip
 - Large, complete virtual keyboard with adjustable position and adjustable transparency
-- Three fully mappable custom control sets: map Vita buttons to any Amiga joystick or key input, three custom control sets supported
+- Three fully mappable custom control sets: map Vita/Switch buttons to any Amiga joystick or key input, three custom control sets supported
 - Multiple hard-file support: up to 4 hdf files (size <2GB each on Vita, size <4GB each on Switch) can be mounted simultaneously
-- Multiple controller support on Vita TV: up to four paired controllers can be fully mapped
+- Multiple controller support on Vita TV/Switch: up to four (eight on Switch) paired controllers can be fully mapped
 - Analog mouse control: control the mouse using the analog stick with adjustable sensitivity
 - Shader support: default "sharp_bilinear_simple" uses integer pre-scale for sharp, undistorted pixels with minimum blur, even if game is zoomed to fill the full screen
-- Custom autofire: any mapped Vita button can have autofire with adjustable rate
+- Custom autofire: any mapped Vita/Switch button can have autofire with adjustable rate
 - Savestate with hard-file support: state can be saved even when hard-files are used
 - Additional emulator settings: sprite-sprite collisions can be enabled, blitter settings can be changed
 - Adjustable stereo separation
@@ -71,8 +66,9 @@ Vita/Switch-exclusive Features
 - Additional savestate slot called auto, for automatic savestate loading
 - Bluetooth keyboard and mouse support (Vita only)
 - Supports loading files from ux0: or uma0: partition (Vita only)
-- Rear touch panel can be enabled for mouse pointer control (Vita only) 
+- Rear touch panel can be enabled for mouse pointer control (Vita only)
 - Split Joy-Con support (Switch only)
+- A "fast mouse" custom button can be mapped to speed up the mouse
 
 Controls
 =====
@@ -184,6 +180,10 @@ FAQ
 Games with known fixes
 ======
 
+- Blastar  
+  Issue: flickering scrolling  
+  Fix: set “Blitter: Normal” and reboot  
+
 - Lure of the Temptress (adf only)  
   Issue: hangs at title  
   Fix: use hdf version  
@@ -284,6 +284,10 @@ Compiling
 
 CHANGELOG
 =====
+1.82
+
+- support up to eight controllers on Switch
+
 1.81
 
 - allow higher CPU speed hack (for Alien Breed 3D)

src/gp2x/menu/menu_config.cpp

@@ -79,71 +79,71 @@ int mainMenu_tapDelay = 10;
 int mainMenu_customControls = 0;
 int mainMenu_custom_currentlyEditingControllerNr = 0;
 int mainMenu_custom_dpad = 0;
-int mainMenu_custom_up[4] = {0,0,0,0};
-int mainMenu_custom_down[4] = {0,0,0,0};
-int mainMenu_custom_left[4] = {0,0,0,0};
-int mainMenu_custom_right[4] = {0,0,0,0};
-int mainMenu_custom_A[4] = {0,0,0,0};
-int mainMenu_custom_B[4] = {0,0,0,0};
-int mainMenu_custom_X[4] = {0,0,0,0};
-int mainMenu_custom_Y[4] = {0,0,0,0};
-int mainMenu_custom_L[4] = {0,0,0,0};
-int mainMenu_custom_R[4] = {0,0,0,0};
+int mainMenu_custom_up[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_down[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_left[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_A[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_B[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_X[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_Y[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_L[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_R[MAX_NUM_CONTROLLERS] = { };
 #ifdef __SWITCH__
-int mainMenu_custom_L2[4] = {0,0,0,0};
-int mainMenu_custom_R2[4] = {0,0,0,0};
-int mainMenu_custom_L3[4] = {0,0,0,0};
-int mainMenu_custom_R3[4] = {0,0,0,0};
+int mainMenu_custom_L2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_R2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_L3[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_R3[MAX_NUM_CONTROLLERS] = { };
 #endif
 #if defined(__PSP2__) || defined(__SWITCH__)
 int mainMenu_custom_controlSet = 0; //This controls which custom config is used
-int mainMenu_custom1_up[4] = {0,0,0,0};
-int mainMenu_custom1_down[4] = {0,0,0,0};
-int mainMenu_custom1_left[4] = {0,0,0,0};
-int mainMenu_custom1_right[4] = {0,0,0,0};
-int mainMenu_custom1_A[4] = {0,0,0,0};
-int mainMenu_custom1_B[4] = {0,0,0,0};
-int mainMenu_custom1_X[4] = {0,0,0,0};
-int mainMenu_custom1_Y[4] = {0,0,0,0};
-int mainMenu_custom1_L[4] = {0,0,0,0};
-int mainMenu_custom1_R[4] = {0,0,0,0};
+int mainMenu_custom1_up[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_down[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_left[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_A[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_B[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_X[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_Y[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_L[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_R[MAX_NUM_CONTROLLERS] = { };
 #ifdef __SWITCH__
-int mainMenu_custom1_L2[4] = {0,0,0,0};
-int mainMenu_custom1_R2[4] = {0,0,0,0};
-int mainMenu_custom1_L3[4] = {0,0,0,0};
-int mainMenu_custom1_R3[4] = {0,0,0,0};
+int mainMenu_custom1_L2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_R2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_L3[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_R3[MAX_NUM_CONTROLLERS] = { };
 #endif
-int mainMenu_custom2_up[4] = {0,0,0,0};
-int mainMenu_custom2_down[4] = {0,0,0,0};
-int mainMenu_custom2_left[4] = {0,0,0,0};
-int mainMenu_custom2_right[4] = {0,0,0,0};
-int mainMenu_custom2_A[4] = {0,0,0,0};
-int mainMenu_custom2_B[4] = {0,0,0,0};
-int mainMenu_custom2_X[4] = {0,0,0,0};
-int mainMenu_custom2_Y[4] = {0,0,0,0};
-int mainMenu_custom2_L[4] = {0,0,0,0};
-int mainMenu_custom2_R[4] = {0,0,0,0};
+int mainMenu_custom2_up[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_down[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_left[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_A[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_B[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_X[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_Y[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_L[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_R[MAX_NUM_CONTROLLERS] = { };
 #ifdef __SWITCH__
-int mainMenu_custom2_L2[4] = {0,0,0,0};
-int mainMenu_custom2_R2[4] = {0,0,0,0};
-int mainMenu_custom2_L3[4] = {0,0,0,0};
-int mainMenu_custom2_R3[4] = {0,0,0,0};
+int mainMenu_custom2_L2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_R2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_L3[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_R3[MAX_NUM_CONTROLLERS] = { };
 #endif
-int mainMenu_custom3_up[4] = {0,0,0,0};
-int mainMenu_custom3_down[4] = {0,0,0,0};
-int mainMenu_custom3_left[4] = {0,0,0,0};
-int mainMenu_custom3_right[4] = {0,0,0,0};
-int mainMenu_custom3_A[4] = {0,0,0,0};
-int mainMenu_custom3_B[4] = {0,0,0,0};
-int mainMenu_custom3_X[4] = {0,0,0,0};
-int mainMenu_custom3_Y[4] = {0,0,0,0};
-int mainMenu_custom3_L[4] = {0,0,0,0};
-int mainMenu_custom3_R[4] = {0,0,0,0};
+int mainMenu_custom3_up[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_down[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_left[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_A[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_B[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_X[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_Y[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_L[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_R[MAX_NUM_CONTROLLERS] = { };
 #ifdef __SWITCH__
-int mainMenu_custom3_L2[4] = {0,0,0,0};
-int mainMenu_custom3_R2[4] = {0,0,0,0};
-int mainMenu_custom3_L3[4] = {0,0,0,0};
-int mainMenu_custom3_R3[4] = {0,0,0,0};
+int mainMenu_custom3_L2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_R2[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_L3[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_R3[MAX_NUM_CONTROLLERS] = { };
 #endif
 #endif
 int mainMenu_autofire = DEFAULT_AUTOFIRE;
@@ -281,7 +281,7 @@ void SetDefaultMenuSettings(int general)
     mainMenu_customControls = 0;
 	 mainMenu_custom_currentlyEditingControllerNr = 0;
     mainMenu_custom_dpad = 0;
-	 for (int i=0; i<4; i++) 
+	 for (int i=0; i<MAX_NUM_CONTROLLERS; i++) 
 	 {
 		 mainMenu_custom_up[i] = 0;
 		 mainMenu_custom_down[i] = 0;
@@ -302,7 +302,7 @@ void SetDefaultMenuSettings(int general)
 	}
 #if defined(__PSP2__) || defined(__SWITCH__)
 	 mainMenu_custom_controlSet = 0;
-	 for (int i=0; i<4; i++) 
+	 for (int i=0; i<MAX_NUM_CONTROLLERS; i++) 
 	 {
 		 mainMenu_custom1_up[i] = 0;
 		 mainMenu_custom1_down[i] = 0;
@@ -1270,7 +1270,7 @@ int saveconfig(int general)
 #else
 	 snprintf((char*)buffer, 255, "custom_controlSet=%d\n",mainMenu_custom_controlSet);
 	 fputs(buffer,f);
-	 for (int i=0; i<4; i++)
+	 for (int i=0; i<MAX_NUM_CONTROLLERS; i++)
 	 {
 		 snprintf((char*)buffer, 255, "custom1_up_Ply%d=%d\n",i,mainMenu_custom1_up[i]);
 		 fputs(buffer,f);
@@ -1695,84 +1695,94 @@ void loadconfig(int general)
         fscanf(f,"custom_L=%d\n",&mainMenu_custom_L[0]);
         fscanf(f,"custom_R=%d\n",&mainMenu_custom_R[0]);
 #else
-		  fscanf(f,"custom_controlSet=%d\n",&mainMenu_custom_controlSet);
-        int config_1_73 = -1;
-        for (int i=0; i<4; i++)
-        {
-			  int j;
-			  fscanf(f,"custom1_up_Ply%d=%d\n",&j,&mainMenu_custom1_up[i]);
-			  fscanf(f,"custom1_down_Ply%d=%d\n",&j,&mainMenu_custom1_down[i]);
-			  fscanf(f,"custom1_left_Ply%d=%d\n",&j,&mainMenu_custom1_left[i]);
-			  fscanf(f,"custom1_right_Ply%d=%d\n",&j,&mainMenu_custom1_right[i]);
-			  fscanf(f,"custom1_A_Ply%d=%d\n",&j,&mainMenu_custom1_A[i]);
-			  fscanf(f,"custom1_B_Ply%d=%d\n",&j,&mainMenu_custom1_B[i]);
-			  fscanf(f,"custom1_X_Ply%d=%d\n",&j,&mainMenu_custom1_X[i]);
-			  fscanf(f,"custom1_Y_Ply%d=%d\n",&j,&mainMenu_custom1_Y[i]);
-			  fscanf(f,"custom1_L_Ply%d=%d\n",&j,&mainMenu_custom1_L[i]);
-			  fscanf(f,"custom1_R_Ply%d=%d\n",&j,&mainMenu_custom1_R[i]);
+		fscanf(f,"custom_controlSet=%d\n",&mainMenu_custom_controlSet);
+		int config_1_73 = -1;
+		int config_1_82 = 1;
+		for (int i=0; i<MAX_NUM_CONTROLLERS; i++)
+		{
+			int j;
+			if (i==4) {
+				if (!fscanf(f,"custom1_up_Ply%d=%d\n",&j,&mainMenu_custom1_up[i])) {
+					config_1_82 = -1;
+					break;
+				}
+			} else
+				fscanf(f,"custom1_up_Ply%d=%d\n",&j,&mainMenu_custom1_up[i]);
+			fscanf(f,"custom1_down_Ply%d=%d\n",&j,&mainMenu_custom1_down[i]);
+			fscanf(f,"custom1_left_Ply%d=%d\n",&j,&mainMenu_custom1_left[i]);
+			fscanf(f,"custom1_right_Ply%d=%d\n",&j,&mainMenu_custom1_right[i]);
+			fscanf(f,"custom1_A_Ply%d=%d\n",&j,&mainMenu_custom1_A[i]);
+			fscanf(f,"custom1_B_Ply%d=%d\n",&j,&mainMenu_custom1_B[i]);
+			fscanf(f,"custom1_X_Ply%d=%d\n",&j,&mainMenu_custom1_X[i]);
+			fscanf(f,"custom1_Y_Ply%d=%d\n",&j,&mainMenu_custom1_Y[i]);
+			fscanf(f,"custom1_L_Ply%d=%d\n",&j,&mainMenu_custom1_L[i]);
+			fscanf(f,"custom1_R_Ply%d=%d\n",&j,&mainMenu_custom1_R[i]);
 #ifdef __SWITCH__
-				if (config_1_73 > 0) {
-					fscanf(f,"custom1_L2_Ply%d=%d\n",&j,&mainMenu_custom1_L2[i]);
+			if (config_1_73 > 0) {
+				fscanf(f,"custom1_L2_Ply%d=%d\n",&j,&mainMenu_custom1_L2[i]);
+				fscanf(f,"custom1_R2_Ply%d=%d\n",&j,&mainMenu_custom1_R2[i]);
+				fscanf(f,"custom1_L3_Ply%d=%d\n",&j,&mainMenu_custom1_L3[i]);
+				fscanf(f,"custom1_R3_Ply%d=%d\n",&j,&mainMenu_custom1_R3[i]);
+				fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
+			} else if (config_1_73 == 0) {
+				fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
+			} else if (config_1_73 < 0) {
+				if (fscanf(f,"custom1_L2_Ply%d=%d\n",&j,&mainMenu_custom1_L2[i])) {
 					fscanf(f,"custom1_R2_Ply%d=%d\n",&j,&mainMenu_custom1_R2[i]);
 					fscanf(f,"custom1_L3_Ply%d=%d\n",&j,&mainMenu_custom1_L3[i]);
 					fscanf(f,"custom1_R3_Ply%d=%d\n",&j,&mainMenu_custom1_R3[i]);
 					fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
-				} else if (config_1_73 == 0) {
-					fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
-				} else if (config_1_73 < 0) {
-					if (fscanf(f,"custom1_L2_Ply%d=%d\n",&j,&mainMenu_custom1_L2[i])) {
-						fscanf(f,"custom1_R2_Ply%d=%d\n",&j,&mainMenu_custom1_R2[i]);
-    					fscanf(f,"custom1_L3_Ply%d=%d\n",&j,&mainMenu_custom1_L3[i]);
-    					fscanf(f,"custom1_R3_Ply%d=%d\n",&j,&mainMenu_custom1_R3[i]);
-						fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
-						config_1_73 = 1;
-					} else {
-						fscanf(f,"2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
-						config_1_73 = 0;
-					}
+					config_1_73 = 1;
+				} else {
+					fscanf(f,"2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
+					config_1_73 = 0;
 				}
+			}
 #else
-			  fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
+			fscanf(f,"custom2_up_Ply%d=%d\n",&j,&mainMenu_custom2_up[i]);
 #endif
-			  fscanf(f,"custom2_down_Ply%d=%d\n",&j,&mainMenu_custom2_down[i]);
-			  fscanf(f,"custom2_left_Ply%d=%d\n",&j,&mainMenu_custom2_left[i]);
-			  fscanf(f,"custom2_right_Ply%d=%d\n",&j,&mainMenu_custom2_right[i]);
-			  fscanf(f,"custom2_A_Ply%d=%d\n",&j,&mainMenu_custom2_A[i]);
-			  fscanf(f,"custom2_B_Ply%d=%d\n",&j,&mainMenu_custom2_B[i]);
-			  fscanf(f,"custom2_X_Ply%d=%d\n",&j,&mainMenu_custom2_X[i]);
-			  fscanf(f,"custom2_Y_Ply%d=%d\n",&j,&mainMenu_custom2_Y[i]);
-			  fscanf(f,"custom2_L_Ply%d=%d\n",&j,&mainMenu_custom2_L[i]);
-			  fscanf(f,"custom2_R_Ply%d=%d\n",&j,&mainMenu_custom2_R[i]);
+			fscanf(f,"custom2_down_Ply%d=%d\n",&j,&mainMenu_custom2_down[i]);
+			fscanf(f,"custom2_left_Ply%d=%d\n",&j,&mainMenu_custom2_left[i]);
+			fscanf(f,"custom2_right_Ply%d=%d\n",&j,&mainMenu_custom2_right[i]);
+			fscanf(f,"custom2_A_Ply%d=%d\n",&j,&mainMenu_custom2_A[i]);
+			fscanf(f,"custom2_B_Ply%d=%d\n",&j,&mainMenu_custom2_B[i]);
+			fscanf(f,"custom2_X_Ply%d=%d\n",&j,&mainMenu_custom2_X[i]);
+			fscanf(f,"custom2_Y_Ply%d=%d\n",&j,&mainMenu_custom2_Y[i]);
+			fscanf(f,"custom2_L_Ply%d=%d\n",&j,&mainMenu_custom2_L[i]);
+			fscanf(f,"custom2_R_Ply%d=%d\n",&j,&mainMenu_custom2_R[i]);
 #ifdef __SWITCH__
-			  if (config_1_73 != 0) {
-				  fscanf(f,"custom2_L2_Ply%d=%d\n",&j,&mainMenu_custom2_L2[i]);
-				  fscanf(f,"custom2_R2_Ply%d=%d\n",&j,&mainMenu_custom2_R2[i]);
-				  fscanf(f,"custom2_L3_Ply%d=%d\n",&j,&mainMenu_custom2_L3[i]);
-				  fscanf(f,"custom2_R3_Ply%d=%d\n",&j,&mainMenu_custom2_R3[i]);
-			  }
+			if (config_1_73 != 0) {
+				fscanf(f,"custom2_L2_Ply%d=%d\n",&j,&mainMenu_custom2_L2[i]);
+				fscanf(f,"custom2_R2_Ply%d=%d\n",&j,&mainMenu_custom2_R2[i]);
+				fscanf(f,"custom2_L3_Ply%d=%d\n",&j,&mainMenu_custom2_L3[i]);
+				fscanf(f,"custom2_R3_Ply%d=%d\n",&j,&mainMenu_custom2_R3[i]);
+			}
 #endif
-			  fscanf(f,"custom3_up_Ply%d=%d\n",&j,&mainMenu_custom3_up[i]);
-			  fscanf(f,"custom3_down_Ply%d=%d\n",&j,&mainMenu_custom3_down[i]);
-			  fscanf(f,"custom3_left_Ply%d=%d\n",&j,&mainMenu_custom3_left[i]);
-			  fscanf(f,"custom3_right_Ply%d=%d\n",&j,&mainMenu_custom3_right[i]);
-			  fscanf(f,"custom3_A_Ply%d=%d\n",&j,&mainMenu_custom3_A[i]);
-			  fscanf(f,"custom3_B_Ply%d=%d\n",&j,&mainMenu_custom3_B[i]);
-			  fscanf(f,"custom3_X_Ply%d=%d\n",&j,&mainMenu_custom3_X[i]);
-			  fscanf(f,"custom3_Y_Ply%d=%d\n",&j,&mainMenu_custom3_Y[i]);
-			  fscanf(f,"custom3_L_Ply%d=%d\n",&j,&mainMenu_custom3_L[i]);
-			  fscanf(f,"custom3_R_Ply%d=%d\n",&j,&mainMenu_custom3_R[i]);
+			fscanf(f,"custom3_up_Ply%d=%d\n",&j,&mainMenu_custom3_up[i]);
+			fscanf(f,"custom3_down_Ply%d=%d\n",&j,&mainMenu_custom3_down[i]);
+			fscanf(f,"custom3_left_Ply%d=%d\n",&j,&mainMenu_custom3_left[i]);
+			fscanf(f,"custom3_right_Ply%d=%d\n",&j,&mainMenu_custom3_right[i]);
+			fscanf(f,"custom3_A_Ply%d=%d\n",&j,&mainMenu_custom3_A[i]);
+			fscanf(f,"custom3_B_Ply%d=%d\n",&j,&mainMenu_custom3_B[i]);
+			fscanf(f,"custom3_X_Ply%d=%d\n",&j,&mainMenu_custom3_X[i]);
+			fscanf(f,"custom3_Y_Ply%d=%d\n",&j,&mainMenu_custom3_Y[i]);
+			fscanf(f,"custom3_L_Ply%d=%d\n",&j,&mainMenu_custom3_L[i]);
+			fscanf(f,"custom3_R_Ply%d=%d\n",&j,&mainMenu_custom3_R[i]);
 #ifdef __SWITCH__
-			  if (config_1_73 != 0) {
-				  fscanf(f,"custom3_L2_Ply%d=%d\n",&j,&mainMenu_custom3_L2[i]);
-				  fscanf(f,"custom3_R2_Ply%d=%d\n",&j,&mainMenu_custom3_R2[i]);
-				  fscanf(f,"custom3_L3_Ply%d=%d\n",&j,&mainMenu_custom3_L3[i]);
-				  fscanf(f,"custom3_R3_Ply%d=%d\n",&j,&mainMenu_custom3_R3[i]);
-			  }
-#endif
+			if (config_1_73 != 0) {
+				fscanf(f,"custom3_L2_Ply%d=%d\n",&j,&mainMenu_custom3_L2[i]);
+				fscanf(f,"custom3_R2_Ply%d=%d\n",&j,&mainMenu_custom3_R2[i]);
+				fscanf(f,"custom3_L3_Ply%d=%d\n",&j,&mainMenu_custom3_L3[i]);
+				fscanf(f,"custom3_R3_Ply%d=%d\n",&j,&mainMenu_custom3_R3[i]);
 			}
-			remap_custom_controls(); // update the custom variables with the appropriate set.
+#endif
+		}
+		remap_custom_controls(); // update the custom variables with the appropriate set.
+		if (config_1_82 == -1) {
+			fscanf(f,"pu=%d\n",&mainMenu_CPU_model);
+		} else
 #endif //__PSP2__
-        fscanf(f,"cpu=%d\n",&mainMenu_CPU_model);
+		fscanf(f,"cpu=%d\n",&mainMenu_CPU_model);
         fscanf(f,"chipset=%d\n",&mainMenu_chipset);
         fscanf(f,"spritecollisions=%d\n",&mainMenu_spriteCollisions);
         fscanf(f,"cpu=%d\n",&mainMenu_CPU_speed);