From b8b12b58ac7e2502c4f62d6b94b7ac832096774e Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@tuxfamily.org>
Date: Thu, 20 Jun 2013 18:50:02 +0200
Subject: [PATCH] cleanups

---
 patchimage.sh      | 10 +++-------
 script.d/common.sh |  4 +---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/patchimage.sh b/patchimage.sh
index c3eaa7c..c4085c4 100755
--- a/patchimage.sh
+++ b/patchimage.sh
@@ -43,13 +43,9 @@ ${WIT} extract "${IMAGE}" ${WORKDIR} --psel=DATA -vv || exit 1
 detect_game_version
 place_files
 
-if [[ ${XML} == "TRUE" ]]; then
-	prepare_xml
-	${WIT} dolpatch ${DOL} xml="${XML_FILE}" --source "${XML_SOURCE}"
-	dolpatch_extra
-else
-	${PPF} a ${DOL} ${PATCH} || exit 1
-fi
+prepare_xml
+${WIT} dolpatch ${DOL} xml="${XML_FILE}" --source "${XML_SOURCE}"
+dolpatch_extra
 
 if [[ ${CUSTOMID} ]]; then
 	${WIT} cp -v -B ${WORKDIR} ./${CUSTOMID}.wbfs -vv --disc-id=${CUSTOMID} ${TMD_OPTS} --name "${GAMENAME}"
diff --git a/script.d/common.sh b/script.d/common.sh
index 77b7bc6..3c6232b 100644
--- a/script.d/common.sh
+++ b/script.d/common.sh
@@ -6,10 +6,8 @@ setup_tools () {
 
 	if [[ $(uname -m) == "x86_64" ]]; then
 		WIT=./tools/wit.64
-		PPF=./tools/applyppf3.64
 	else
 		WIT=./tools/wit.32
-		PPF=./tools/applyppf3.32
 	fi
 
 }
@@ -105,7 +103,7 @@ while [[ $xcount -lt $pcount ]]; do
 			fi
 		;;
 
-		--patch* )
+		--riivolution* )
 			RIIVOLUTION=${1/*=}
 			if [[ -e "${RIIVOLUTION}" ]]; then
 				unzip "${RIIVOLUTION}" >/dev/null