From 68581f3bb9786357b53f5e5a2f6d15f2ec11988c Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@tuxfamily.org>
Date: Sat, 15 Jun 2013 20:19:18 +0200
Subject: [PATCH] prepare for build without .ppf patches

---
 patchimage.sh              |  6 ++----
 script.d/newersmb.sh       | 11 ++++-------
 script.d/newersummersun.sh |  7 +------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/patchimage.sh b/patchimage.sh
index e3d740b..bd5c031 100755
--- a/patchimage.sh
+++ b/patchimage.sh
@@ -36,7 +36,6 @@ cleanup_prebuild
 check_input_image
 check_input_image_special
 check_riivolution_patch
-prepare_riivolution_dir
 
 ${WIT} extract "${IMAGE}" ${WORKDIR} --psel=DATA -vv || exit 1
 
@@ -44,10 +43,9 @@ detect_game_version
 place_files
 
 if [[ ${XML} ]]; then
-	XML_FILE="${XML_FILE}"${REG_LETTER}.xml
-	wit dolpatch ${DOL} xml="${XML_FILE}" "${XML_SOURCE}"
+	wit dolpatch ${DOL} xml="${XML_FILE}" --source "${XML_SOURCE}" || exit 1
 else
-	${PPF} a ${DOL} ${PATCH}
+	${PPF} a ${DOL} ${PATCH} || exit 1
 fi
 
 if [[ ${CUSTOMID} ]]; then
diff --git a/script.d/newersmb.sh b/script.d/newersmb.sh
index e08b855..4f7bec7 100644
--- a/script.d/newersmb.sh
+++ b/script.d/newersmb.sh
@@ -2,9 +2,12 @@
 
 WORKDIR=./nsmb.d
 DOL=${WORKDIR}/sys/main.dol
-RIIVOLUTION_ZIP=NewerSMB.zip
+RIIVOLUTION_ZIP=NewerSMBW.zip
 RIIVOLUTION_DIR=NewerFiles
 GAMENAME="Newer SMB"
+XML=FALSE
+XML_SOURCE=./"${RIIVOLUTION_DIR}"/NewerSMBW/
+XML_FILE=./"${RIIVOLUTION_DIR}"/riivolution/NewerSMBW.xml
 
 show_notes () {
 
@@ -19,12 +22,6 @@ Supported Versions:	EURv1, EURv2, USAv1, USAv2, JPNv1
 
 }
 
-prepare_riivolution_dir () {
-
-	echo
-
-}
-
 check_input_image_special () {
 
 	if [[ ! ${IMAGE} ]]; then
diff --git a/script.d/newersummersun.sh b/script.d/newersummersun.sh
index 4f8fc1a..534eb88 100644
--- a/script.d/newersummersun.sh
+++ b/script.d/newersummersun.sh
@@ -37,12 +37,6 @@ check_input_image_special () {
 
 }
 
-prepare_riivolution_dir () {
-
-	cp ./"${RIIVOLUTION_DIR}"/SumSun/Loader.bin ./"${RIIVOLUTION_DIR}"/riivolution/
-
-}
-
 detect_game_version () {
 
 	if [[ -f ${WORKDIR}/files/COPYDATE_LAST_2009-10-03_232911 ]]; then
@@ -65,6 +59,7 @@ detect_game_version () {
 		exit 1
 	fi
 
+	XML_FILE="${XML_FILE}"${REG_LETTER}.xml
 	GAMEID=SMN${REG_LETTER}02
 
 }