Merge remote-tracking branch 'github/master'

database/nsmbw.db

@@ -28,3 +28,4 @@ SMN*ZY:Super Mario Skyland
 SMV*01:Super Mario Vacation
 MRR*01:New Super Mario Bros. Wii Retro Remix
 SMN*ZB:Newer Super Luigi Wii - Dark Moon
+SAD*12:Newer Alpine Dream

database/scripts.db

@@ -28,6 +28,7 @@ NSMB27:MLGSuperLuigi:nsmbw/mlgsuperluigibroswii.sh
 NSMB28:Cliff:nsmbw/cliffsmb.sh
 NSMB29:Virtual:nsmbw/virtualspecial.sh
 NSMB30:NSLDM:nsmbw/luigidarkmoon.sh
+NSMB31:Alpine:nsmbw/alpinedream.sh
 NSMB99:NSMBWCharacters:nsmbw/nsmbw_characters.sh
 MKW1:Wiimmfi:mkwii/wiimmfi.sh
 MKW2:Wiimmpatch:wiimmfi_generic.sh

patchimage.sh

@@ -56,7 +56,7 @@ setup_tools
 for game in ${GAME[@]}; do
 	case ${game} in
 		NSMB_ALL )
-			NEW_GAME=(${NEW_GAME[@]} NSMB{1..29})
+			NEW_GAME=(${NEW_GAME[@]} NSMB{1..31})
 		;;
 
 		PKMN_ALL )

scripts/common/downloader.sh

@@ -47,7 +47,7 @@ download_riivolution_patch () {
 			${GDOWN} "${DOWNLOAD_LINK}" \
 				"${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp >/dev/null || \
 				( rm "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp && \
-					echo -e "\nDownload failed!" && exit 57 )
+					download_riivolution_failed && exit 57 )
 			mv "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp \
 				"${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"
 			echo "*** >> unpacking"
@@ -61,7 +61,7 @@ download_riivolution_patch () {
 				--path="${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp \
 				"${DOWNLOAD_LINK}" >/dev/null || \
 				( rm "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp && \
-					echo -e "\nDownload failed!" && exit 57 )
+					download_riivolution_failed && exit 57 )
 			mv "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp \
 				"${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"
 			echo "*** >> unpacking"
@@ -80,6 +80,7 @@ download_riivolution_patch () {
 
 		"" )
 			echo "no download link for ${GAMENAME} available."
+            download_riivolution_failed
 			exit 21
 		;;
 
@@ -89,7 +90,7 @@ download_riivolution_patch () {
 			wget -nv --no-check-certificate "${DOWNLOAD_LINK}" \
 				-O "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp || \
 				( rm "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp && \
-					echo -e "\nDownload failed!" && exit 57 )
+					download_riivolution_failed && exit 57 )
 			mv "${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"__tmp \
 				"${PATCHIMAGE_RIIVOLUTION_DIR}/${RIIVOLUTION_ZIP}"
 			echo "*** >> unpacking"
@@ -122,3 +123,11 @@ download_covers () {
 	done
 
 }
+
+download_riivolution_failed () {
+    echo -e "\nDownload failed!
+You can try to download manualy from :
+    https://goaibox.com/sl/3suwkMVFZj
+    https://archive.org/download/new-super-mario-bros-wii-mod-archive/"
+
+}

scripts/common/messages.sh

@@ -36,6 +36,7 @@ NSMB27	MLGSuperLuigi		MLG Super Luigi Bros. Wii
 NSMB28	Cliff			Cliff Super Mario Bros. Wii
 NSMB29	Virtual			Challenging Super Mario Bros. Wii: Virtual Special
 NSMB30	NSLDM			Newer Super Luigi Wii: Dark Moon
+NSMB31  Alpine          Newer Alpine Dream
 
 NSMB99	NSMBWCharacters		Customize Characters
 
@@ -139,6 +140,8 @@ NSMB26	RevisedSuperMarioBros	RSMBW Version 1.1.zip
 NSMB27	MLGSuperLuigi		MLGLuigiWii.zip
 NSMB28	Cliff			Cliff_Super_Mario_Brothers_Wiiv1.1.1.zip
 NSMB29	Virtual			ChaSMBW_VrS_v0.2.zip
+NSMB30  NSLDM			Luigi_Dark_Moon_1.1.zip
+NSMB31  Alpine			Newer-Alpine-Dream-main.zip
 
 NSMB99	NSMBWCharacters		Alternative Character Files are supplied
 "

scripts/nsmbw/alpinedream.sh

@@ -0,0 +1,125 @@
+#!/bin/bash
+
+WORKDIR=nsmb.d
+DOL=${WORKDIR}/sys/main.dol
+DOWNLOAD_LINK="https://github.com/AlphaT12/Newer-Alpine-Dream/archive/refs/heads/main.zip"
+RIIVOLUTION_ZIP="Newer-Alpine-Dream-main.zip"
+RIIVOLUTION_DIR="Newer-Alpine-Dream-main/NewerAD"
+GAMENAME="Newer Alpine Dream"
+XML_SOURCE="${RIIVOLUTION_DIR}"
+XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/NewerAD.xml
+GAME_TYPE=RIIVOLUTION
+BANNER_LOCATION=${WORKDIR}/files/opening.bnr
+WBFS_MASK="SMN[PEJ]01"
+
+show_notes () {
+
+echo -e \
+"************************************************
+${GAMENAME}
+
+11 levels with 8 classic levels, 1 tower level, 1 castle level, 1 secret hard level
+
+By ALPHA_T
+
+Source: https://github.com/AlphaT12/Newer-Alpine-Dream
+Base Image:		New Super Mario Bros. Wii (SMN?01)
+Supported Versions:	EURv1, EURv2, USAv1, USAv2, JPNv1
+
+************************************************"
+
+}
+
+detect_game_version () {
+
+	nsmbw_version
+
+	GAMEID=SAD${REG_LETTER}12
+
+}
+
+place_files () {
+
+	NEW_DIRS=( "${WORKDIR}"/files/LevelSamples "${WORKDIR}"/files/NewerRes "${WORKDIR}"/files/Sound/new/sfx "${WORKDIR}"/files/Maps )
+	for dir in "${NEW_DIRS[@]}"; do
+		mkdir -p "${dir}"
+	done
+
+	case ${VERSION} in
+		EUR* )
+			LANGDIRS=( EngEU FraEU GerEU ItaEU SpaEU NedEU )
+			for dir in "${LANGDIRS[@]}"; do
+				cp -r "${RIIVOLUTION_DIR}"/{Font,Message}/ "${WORKDIR}"/files/EU/"${dir}"/
+			done
+			cp "${RIIVOLUTION_DIR}"/OthersP/* "${WORKDIR}"/files/EU/Layout/openingTitle/
+		;;
+
+		USAv* )
+			LANGDIRS=( FraUS EngUS SpaUS )
+			for dir in "${LANGDIRS[@]}"; do
+				cp -r "${RIIVOLUTION_DIR}"/{Font,Message}/ "${WORKDIR}"/files/US/"${dir}"/
+			done
+			cp "${RIIVOLUTION_DIR}"/OthersE/* "${WORKDIR}"/files/US/Layout/openingTitle/
+		;;
+
+		JPNv1 )
+			cp "${RIIVOLUTION_DIR}"/Font/* "${WORKDIR}"/files/JP/Font/
+			cp "${RIIVOLUTION_DIR}"/Message/* "${WORKDIR}"/files/JP/Message/
+			cp "${RIIVOLUTION_DIR}"/OthersJ/* "${WORKDIR}"/files/JP/Layout/openingTitle/
+		;;
+	esac
+
+	cp "${RIIVOLUTION_DIR}"/Tilesets/* "${WORKDIR}"/files/Stage/Texture/
+	cp "${RIIVOLUTION_DIR}"/TitleReplay/* "${WORKDIR}"/files/Replay/title/
+	cp "${RIIVOLUTION_DIR}"/BGs/* "${WORKDIR}"/files/Object/
+	cp "${RIIVOLUTION_DIR}"/SpriteTex/* "${WORKDIR}"/files/Object/
+	cp "${RIIVOLUTION_DIR}"/Layouts/* "${WORKDIR}"/files/Layout/
+	cp -r "${RIIVOLUTION_DIR}"/Music/*.er "${WORKDIR}"/files/Sound/new/
+	cp "${RIIVOLUTION_DIR}"/Music/sfx/* "${WORKDIR}"/files/Sound/new/sfx/
+	cp "${RIIVOLUTION_DIR}"/Music/stream/* "${WORKDIR}"/files/Sound/stream/
+	cp "${RIIVOLUTION_DIR}"/Music/rsar/* "${WORKDIR}"/files/Sound/
+	cp "${RIIVOLUTION_DIR}"/NewerRes/* "${WORKDIR}"/files/NewerRes/
+	cp "${RIIVOLUTION_DIR}"/LevelSamples/* "${WORKDIR}"/files/LevelSamples/
+	cp "${RIIVOLUTION_DIR}"/Others/charaChangeSelectContents.arc "${WORKDIR}"/files/Layout/charaChangeSelectContents/charaChangeSelectContents.arc
+	cp "${RIIVOLUTION_DIR}"/Others/characterChange.arc "${WORKDIR}"/files/Layout/characterChange/characterChange.arc
+	cp "${RIIVOLUTION_DIR}"/Others/continue.arc "${WORKDIR}"/files/Layout/continue/continue.arc
+	cp "${RIIVOLUTION_DIR}"/Others/controllerInformation.arc "${WORKDIR}"/files/Layout/controllerInformation/controllerInformation.arc
+	cp "${RIIVOLUTION_DIR}"/Others/corseSelectMenu.arc "${WORKDIR}"/files/Layout/corseSelectMenu/corseSelectMenu.arc
+	cp "${RIIVOLUTION_DIR}"/Others/corseSelectUIGuide.arc "${WORKDIR}"/files/Layout/corseSelectUIGuide/corseSelectUIGuide.arc
+	cp "${RIIVOLUTION_DIR}"/Others/dateFile.arc "${WORKDIR}"/files/Layout/dateFile/dateFile.arc
+	cp "${RIIVOLUTION_DIR}"/Others/dateFile_OLD.arc "${WORKDIR}"/files/Layout/dateFile/dateFile_OLD.arc
+	cp "${RIIVOLUTION_DIR}"/Others/easyPairing.arc "${WORKDIR}"/files/Layout/easyPairing/easyPairing.arc
+	cp "${RIIVOLUTION_DIR}"/Others/extensionControllerNunchuk.arc "${WORKDIR}"/files/Layout/extensionControllerNunchuk/extensionControllerNunchuk.arc
+	cp "${RIIVOLUTION_DIR}"/Others/extensionControllerYokomochi.arc "${WORKDIR}"/files/Layout/extensionControllerYokomochi/extensionControllerYokomochi.arc
+	cp "${RIIVOLUTION_DIR}"/Others/fileSelectBase.arc "${WORKDIR}"/files/Layout/fileSelectBase/fileSelectBase.arc
+	cp "${RIIVOLUTION_DIR}"/Others/fileSelectBase_OLD.arc "${WORKDIR}"/files/Layout/fileSelectBase/fileSelectBase_OLD.arc
+	cp "${RIIVOLUTION_DIR}"/Others/fileSelectPlayer.arc "${WORKDIR}"/files/Layout/fileSelectPlayer/fileSelectPlayer.arc
+	cp "${RIIVOLUTION_DIR}"/Others/gameScene.arc "${WORKDIR}"/files/Layout/gameScene/gameScene.arc
+	cp "${RIIVOLUTION_DIR}"/Others/infoWindow.arc "${WORKDIR}"/files/Layout/infoWindow/infoWindow.arc
+	cp "${RIIVOLUTION_DIR}"/Others/miniGameCannon.arc "${WORKDIR}"/files/Layout/miniGameCannon/miniGameCannon.arc
+	cp "${RIIVOLUTION_DIR}"/Others/miniGameWire.arc "${WORKDIR}"/files/Layout/miniGameWire/miniGameWire.arc
+	cp "${RIIVOLUTION_DIR}"/Others/pauseMenu.arc "${WORKDIR}"/files/Layout/pauseMenu/pauseMenu.arc
+	cp "${RIIVOLUTION_DIR}"/Others/pointResultDateFile.arc "${WORKDIR}"/files/Layout/pointResultDateFile/pointResultDateFile.arc
+	cp "${RIIVOLUTION_DIR}"/Others/pointResultDateFileFree.arc "${WORKDIR}"/files/Layout/pointResultDateFileFree/pointResultDateFileFree.arc
+	cp "${RIIVOLUTION_DIR}"/Others/preGame.arc "${WORKDIR}"/files/Layout/preGame/preGame.arc
+	cp "${RIIVOLUTION_DIR}"/Others/select_cursor.arc "${WORKDIR}"/files/Layout/select_cursor/select_cursor.arc
+	cp "${RIIVOLUTION_DIR}"/Others/sequenceBG.arc "${WORKDIR}"/files/Layout/sequenceBG/sequenceBG.arc
+	cp "${RIIVOLUTION_DIR}"/Others/staffCredit.arc "${WORKDIR}"/files/Layout/staffCredit/staffCredit.arc
+	cp "${RIIVOLUTION_DIR}"/Others/stockItem.arc "${WORKDIR}"/files/Layout/stockItem/stockItem.arc
+	cp "${RIIVOLUTION_DIR}"/Others/stockItemShadow.arc "${WORKDIR}"/files/Layout/stockItemShadow/stockItemShadow.arc
+	cp "${RIIVOLUTION_DIR}"/Others/yesnoWindow.arc "${WORKDIR}"/files/Layout/yesnoWindow/yesnoWindow.arc
+	cp -r "${RIIVOLUTION_DIR}"/Maps/* "${WORKDIR}"/files/Maps/
+	cp "${RIIVOLUTION_DIR}"/Stages/* "${WORKDIR}"/files/Stage/
+
+}
+
+dolpatch () {
+
+	cp "${XML_FILE}" "${XML_FILE}".new
+	sed -e 's/80001800/803482C0/g' -i "${XML_FILE}".new
+	XML_FILE="${XML_FILE}".new
+
+	${WIT} dolpatch ${DOL} xml="${XML_FILE}" -s "${XML_SOURCE}" xml="${PATCHIMAGE_PATCH_DIR}/NewerSMBW-Loader.xml" -q
+	${WIT} dolpatch ${DOL} xml="${PATCHIMAGE_PATCH_DIR}/NSMBW_AP.xml" -q
+
+}

scripts/nsmbw/newerfallingleaf.sh

@@ -39,7 +39,7 @@ detect_game_version () {
 place_files () {
 
 
-	NEW_DIRS=( "${WORKDIR}"/files/LevelSamples "${WORKDIR}"/files/NewerRes "${WORKDIR}"/files/Maps )
+	NEW_DIRS=( "${WORKDIR}"/files/LevelSamples "${WORKDIR}"/files/NewerRes "${WORKDIR}"/files/Maps "${WORKDIR}"/files/Sound/new )
 	for dir in "${NEW_DIRS[@]}"; do
 		mkdir -p "${dir}"
 	done