fully support EUR and USA Bravely Second Uncensoring

auto-detect provided game version
remove an unused variable
general support for multi-input 3DS ROMs

patchimage.sh

@@ -328,9 +328,12 @@ case ${GAME_TYPE} in
 	"HANS" )
 		show_notes
 		echo -e "\n*** 1) check_input_rom"
-		check_input_rom
+		if [[ ${HANS_MULTI_SOURCE} ]]; then
+			check_input_rom_special
+		else	check_input_rom
+		fi
 
-		rm -rf romfs/ romfs.bin ${RFS}
+		rm -rf romfs/ romfs.bin "${ROMFS}"
 
 		echo -e "\n*** 2) check_hans_files"
 		check_hans_files
@@ -345,12 +348,12 @@ case ${GAME_TYPE} in
 		patch_romfs
 
 		echo -e "\n*** 6) repack_romfs"
-		repack_3dsromfs romfs/ "${RFS}" || exit 51
+		repack_3dsromfs romfs/ "${ROMFS}" || exit 51
 
-		mv "${RFS}" "${PATCHIMAGE_ROM_DIR}"
+		mv "${ROMFS}" "${PATCHIMAGE_ROM_DIR}"
 
 		echo "
-	*** succesfully created new romfs as \"${PATCHIMAGE_ROM_DIR}/${RFS}\"
+	*** succesfully created new romfs as \"${PATCHIMAGE_ROM_DIR}/${ROMFS}\"
 "
 
 	[[ ${DATA} ]] && echo \

script.d/bravelyseconduncensored.sh

@@ -2,9 +2,10 @@
 
 GAMENAME="Bravely Second Uncensored"
 GAME_TYPE=HANS
+HANS_MULTI_SOURCE=TRUE
 
-CXI_MASK="*000400000017[bB][bB]00*cxi"
+CXI_MASK_EUR="*000400000017[bB][bB]00*cxi"
-ROMFS="0017BB00.romfs"
+CXI_MASK_USA="*000400000017[bB][aA]00*cxi"
 
 UNP_EXTRA_ARGS="-- -pAsia81"
 
@@ -21,36 +22,50 @@ Supported Versions:	US, EU
 
 }
 
-check_hans_files () {
+check_input_rom_special () {
 
-	echo "
+	GAME_VERSION=EUR
-*** Game Version ***
+	CXI_MASK=${CXI_MASK_EUR}
-	EU	patch European version of Bravely Second
+	echo "<< trying EUR game version"
-	US	patch US version of Bravely Second
+	check_input_rom
 
-enter either 'EU' or 'US':
-"
 
-	read choice
+	if [[ ! ${CXI} ]]; then
+		GAME_VERSION=USA
+		CXI_MASK=${CXI_MASK_USA}
+		echo "<< trying USA game version"
+		check_input_rom
+	fi
 
-	case ${choice} in
+	if [[ ! ${CXI} ]]; then
-		eu | EU )
+		echo -e "\nneither EUR nor USA version of Bravely Second found."
+		exit 15
+	fi
+
+	case ${GAME_VERSION} in
+		EUR )
+			echo ">> found EUR game version"
+			ROMFS="0017BB00.romfs"
 			DOWNLOAD_LINK="mega:///#!N0QEHLRB!g_Wy5dngt4xgVXtk1BhQaqSSRj0phjP6xMp776OSEo8"
 			RIIVOLUTION_ZIP="Bravely_Second_Uncensored_EUR_MINI_Asia81.rar"
 			RIIVOLUTION_DIR="Bravely_Second_Uncensored_EUR_MINI_Asia81/ExtractedRomFS"
 		;;
 
-		us | US )
+		USA )
+			echo ">> found USA game version"
+			ROMFS="0017BA00.romfs"
 			DOWNLOAD_LINK="mega:///#!9sx1QKRQ!A6qzCkvY9HmPGu4VIy1TiikTRgbE-vUho99LOYWxA84"
 			RIIVOLUTION_ZIP="Bravely_Second_Uncensored_USA_MINI_Asia81.rar"
 			RIIVOLUTION_DIR="Bravely_Second_Uncensored_USA_MINI_Asia81/ExtractedRomFS"
 		;;
-
-		* ) echo "invalid choice made, exiting!"
-		    exit 75
-		;;
 	esac
 
+	exit 0
+
+}
+
+check_hans_files () {
+
 	check_riivolution_patch
 
 }

script.d/common.sh

@@ -300,16 +300,16 @@ check_input_rom () {
 		if [[ -f ${CXI} ]]; then
 			x=6
 			CXI=${CXI}
-			RFS=${ROMFS}
 		else
 			CXI=$(find ${PATCHIMAGE_3DS_DIR} -name ${CXI_MASK})
 			if [[ -f ${CXI} ]]; then
 				x=7
 				CXI=${CXI}
-				RFS=${ROMFS}
 			else
-				echo -e "error: could not find suitable ROM, specify using --rom"
+				if [[ ! ${HANS_MULTI_SOURCE} ]]; then
-				exit 15
+					echo -e "error: could not find suitable ROM, specify using --rom"
+					exit 15
+				fi
 			fi
 		fi
 	fi