* fix us lang files for NSMBW3

* fix us lang files for WinterMoon
* fix non-us opening title for WinterMoon
* add support for Super Mario Vacation

ChangeLog

@@ -1,3 +1,11 @@
+v3.1:
+- bugfix: for NSMBW3 on US games the language files weren't updated
+- bugfix: for Super Mario: Mushroom Adventure PLUS - Winter Moon on US
+          games the language files weren't updated
+- bugfix: for Super Mario: Mushroom Adventure PLUS - Winter Moon on non-US
+          games the supplied OpeningTitle does not work, so don' use it
+- support for Super Mario Vacation
+
 v3.0:
 - bugfix: don't exit with error on check_input_image as we will
   call check_input_image_special aswell

GAMEIDS

@@ -16,4 +16,6 @@ SMN?11		New Super Mario Bros. 4
 
 SMM?02		Super Mario: Mushroom Adventure PLUS - Winter Moon
 
+SMV?01		Super Mario Vacation
+
 MRR?01		New Super Mario Bros. Wii Retro Remix

README

@@ -13,7 +13,7 @@ own the original, you can't blame me. patchimage is 100% legal, as it
 does not contain any propritary contents, nor is able to grab them.
 
 Supported Games
-* NSMBW3: The Final Levels [SLF?01]
+* NSMBW3: The Final Levels (riivolution) [SLF?01]
 * Newer SMBW (riivolution) [SMN?03]
 * Cannon SMBW (riivolution) [SMN?04]
 * Another SMBW (riivolution) [SMN?05]
@@ -22,7 +22,8 @@ Supported Games
 * Epic Super Bower World (riivolution) [SMN?08]
 * Koopa Country (riivolution) [SMN?10]
 * New Super Mario Bros. 4 (riivolution) [SMN?11]
-*Super Mario: Mushroom Adventure PLUS - Winter Moon [SMM?02]
+* Super Mario: Mushroom Adventure PLUS - Winter Moon (riivolution) [SMM?02]
+* Super Mario Vacation (riivolution) [SMV?01]
 * New Super Mario Bros. Wii Retro Remix [MRR?01]
 * The Legend of Zelda: Parallel Worlds (ips)
 

patchimage.sh

@@ -71,6 +71,10 @@ case ${GAME} in
 		source ${PATCHIMAGE_SCRIPT_DIR}/nsmbw3.sh
 	;;
 
+	l | L | SMV | "Super Mario Vacation" )
+		source ${PATCHIMAGE_SCRIPT_DIR}/summervacation.sh
+	;;
+
 	1 | ParallelWorlds | "The Legend of Zelda: Parallel Worlds" )
 		source ${PATCHIMAGE_SCRIPT_DIR}/parallelworlds.sh
 	;;

script.d/common.sh

@@ -71,6 +71,7 @@ H	New Super Mario Bros. 4
 I	New Super Mario Bros. Wii Retro Remix
 J	Super Mario: Mushroom Adventure PLUS - Winter Moon
 K	NSMBW3: The Final Levels
+L	Super Mario Vacation
 
 1	The Legend of Zelda: Parallel Worlds
 "

script.d/nsmbw3.sh

@@ -62,7 +62,7 @@ place_files () {
 		USAv* )
 			LANGDIRS=( FraUS EngUS SpaUS )
 			for dir in ${LANGDIRS[@]}; do
-				cp -r "${RIIVOLUTION_DIR}"/EU/EngEU/{Message,Layout} ${WORKDIR}/files/EU/${dir}/
+				cp -r "${RIIVOLUTION_DIR}"/EU/EngEU/{Message,Layout} ${WORKDIR}/files/US/${dir}/
 			done
 		;;
 

script.d/summervacation.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+
+WORKDIR=nsmb.d
+DOL=${WORKDIR}/sys/main.dol
+DOWNLOAD_LINK="https://dl.dropboxusercontent.com/u/90984778/Super_Mario_Vacation_v1.00.zip"
+RIIVOLUTION_ZIP="Super_Mario_Vacation_v1.00.zip"
+RIIVOLUTION_DIR="Super_Mario_Vacation_v1.00"
+GAMENAME="Super Mario Vacation"
+XML_SOURCE="${RIIVOLUTION_DIR}"/Vacation
+XML_FILE="${RIIVOLUTION_DIR}"/riivolution/Vacation
+GAME_TYPE=RIIVOLUTION
+BANNER_LOCATION=${WORKDIR}/files/opening.bnr
+
+show_notes () {
+
+echo -e \
+"************************************************
+${GAMENAME}
+
+NSMBW Hack featuring 7 new and one old level.
+
+Source:			http://rvlution.net/forums/viewtopic.php?f=53&t=1839
+Base Image:		New Super Mario Bros. Wii (SMN?01)
+Supported Versions:	EURv1, EURv2, USAv1, USAv2, JPNv1
+************************************************"
+
+}
+
+check_input_image_special () {
+
+	check_input_image_nsmb
+
+}
+
+detect_game_version () {
+
+	nsmbw_version
+
+	XML_FILE="${XML_FILE}"${REG_LETTER}.xml
+	GAMEID=SMV${REG_LETTER}01
+
+}
+
+place_files () {
+
+	NEW_DIRS=( ${WORKDIR}/files/EU/NedEU/Message )
+	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}"/Vacation/Message ${WORKDIR}/files/EU/${dir}/
+			done
+			cp "${RIIVOLUTION_DIR}"/Vacation/OpeningP/* ${WORKDIR}/files/EU/Layout/openingTitle/openingTitle.arc
+		;;
+
+		USAv* )
+			LANGDIRS=( FraUS EngUS SpaUS )
+			for dir in ${LANGDIRS[@]}; do
+				cp -r "${RIIVOLUTION_DIR}"/Vacation/Message ${WORKDIR}/files/US/${dir}/
+			done
+			cp "${RIIVOLUTION_DIR}"/Vacation/OpeningE/* ${WORKDIR}/files/US/Layout/openingTitle/openingTitle.arc
+		;;
+
+		JPNv1 )
+			cp -r "${RIIVOLUTION_DIR}"/Vacation/Message ${WORKDIR}/files/JP/
+			cp "${RIIVOLUTION_DIR}"/Vacation/OpeningJ/* ${WORKDIR}/files/JP/Layout/openingTitle/openingTitle.arc
+		;;
+	esac
+
+	cp -r "${RIIVOLUTION_DIR}"/Vacation/{Env,Layout,Object,Sound,Stage,WorldMap} ${WORKDIR}/files/
+
+}
+
+
+dolpatch () {
+
+	${WIT} dolpatch ${DOL}	\
+		"802F148C=53756D6D53756E#7769696D6A3264" \
+		"802F118C=53756D6D53756E#7769696D6A3264" \
+		"802F0F8C=53756D6D53756E#7769696D6A3264" \
+		xml="${PATCHIMAGE_PATCH_DIR}/NSMBW_AP.xml" -q
+
+}
+

script.d/wintermoon.sh

@@ -64,20 +64,20 @@ place_files () {
 			for dir in ${LANGDIRS[@]}; do
 				cp "${RIIVOLUTION_DIR}"/Others/Text.arc ${WORKDIR}/files/EU/${dir}/Message/Message.arc
 			done
-			cp "${RIIVOLUTION_DIR}"/Others/Title/Logo.arc ${WORKDIR}/files/EU/Layout/openingTitle/openingTitle.arc
+			#cp "${RIIVOLUTION_DIR}"/Others/Title/Logo.arc ${WORKDIR}/files/EU/Layout/openingTitle/openingTitle.arc
 		;;
 
 		USAv* )
 			LANGDIRS=( FraUS EngUS SpaUS )
 			for dir in ${LANGDIRS[@]}; do
-				cp "${RIIVOLUTION_DIR}"/Others/Text.arc ${WORKDIR}/files/EU/${dir}/Message/Message.arc
+				cp "${RIIVOLUTION_DIR}"/Others/Text.arc ${WORKDIR}/files/US/${dir}/Message/Message.arc
 			done
 			cp "${RIIVOLUTION_DIR}"/Others/Title/Logo.arc ${WORKDIR}/files/US/Layout/openingTitle/openingTitle.arc
 		;;
 
 		JPNv1 )
 			cp "${RIIVOLUTION_DIR}"/Others/Text.arc ${WORKDIR}/files/JP/
-			cp "${RIIVOLUTION_DIR}"/Others/Title/Logo.arc ${WORKDIR}/files/JP/Layout/openingTitle/openingTitle.arc
+			#cp "${RIIVOLUTION_DIR}"/Others/Title/Logo.arc ${WORKDIR}/files/JP/Layout/openingTitle/openingTitle.arc
 		;;
 	esac