From 654f9635ab87364b9c236aec4e6cb7e3b41aeead Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Tue, 13 May 2014 19:32:54 +0200
Subject: [PATCH] more fixes and support for Super Mario Skyland

---
 ChangeLog           |  5 ++++
 README.GAMEIDS      |  1 +
 patchimage.sh       |  5 +++-
 script.d/common.sh  |  6 ++++-
 script.d/skyland.sh | 65 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 script.d/skyland.sh

diff --git a/ChangeLog b/ChangeLog
index e8a211b..6645ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+v4.93:
+- various fixups
+- wiimmfi generic: show game titles next to id when showing available images
+- add support for Super Mario Skyland (SMN?ZY)
+
 v4.92:
 - wiimmfi mario kart: check if user-provided input is correct
 - wiimmfi generic: add generic wiimmfi patcher (only one game at a time)
diff --git a/README.GAMEIDS b/README.GAMEIDS
index af397a8..3fe6068 100644
--- a/README.GAMEIDS
+++ b/README.GAMEIDS
@@ -14,6 +14,7 @@ SMN?09		?
 SMN?10		Koopa Country
 SMN?11		New Super Mario Bros. 4
 SMN?12		Awesomer Super Luigi Mini
+SMN?ZY		Super Mario Skyland
 
 SMM?02		Super Mario: Mushroom Adventure PLUS - Winter Moon
 
diff --git a/patchimage.sh b/patchimage.sh
index ce189db..4a18bab 100755
--- a/patchimage.sh
+++ b/patchimage.sh
@@ -99,6 +99,10 @@ case ${GAME} in
 		source ${PATCHIMAGE_SCRIPT_DIR}/wiimmfi_generic.sh
 	;;
 
+	p | P | Sykland )
+		source ${PATCHIMAGE_SCRIPT_DIR}/skyland.sh
+	;;
+
 	1 | ParallelWorlds | "The Legend of Zelda: Parallel Worlds" )
 		source ${PATCHIMAGE_SCRIPT_DIR}/parallelworlds.sh
 	;;
@@ -165,7 +169,6 @@ case ${GAME_TYPE} in
 		fi
 
 		echo "*** 12) remove workdir"
-		cd ..
 		rm -rf ${WORKDIR}
 
 		echo -e "\n >>> ${GAMENAME} saved as: ${PATCHIMAGE_WBFS_DIR}/${GAMEID}.wbfs\n"
diff --git a/script.d/common.sh b/script.d/common.sh
index 914f61b..4f6e4c3 100644
--- a/script.d/common.sh
+++ b/script.d/common.sh
@@ -57,8 +57,12 @@ K	NSMBW3: The Final Levels
 L	Super Mario Vacation
 M	Awesomer Super Luigi Mini
 
+<<<>>>
 N	Wiimfi Patcher. Patch Mario Kart to use Wiimm's server
 O	Wiimfi Patcher. Patch WFC games to use Wiimm's server (exp)
+<<<>>>
+
+P	Super Mario Skyland
 
 1	The Legend of Zelda: Parallel Worlds
 "
@@ -453,7 +457,7 @@ while [[ $xcount -lt $pcount ]]; do
 		;;
 
 		"" | --help )
-			echo -e "patchimage 4.91 (2014-05-10)
+			echo -e "patchimage 4.93 (2014-05-13)
 
 	(c) 2013-2014 Christopher Roy Bratusek <nano@jpberlin.de>
 	patchimage creates wbfs images from riivolution patches.
diff --git a/script.d/skyland.sh b/script.d/skyland.sh
new file mode 100644
index 0000000..d62a3d5
--- /dev/null
+++ b/script.d/skyland.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+WORKDIR=nsmb.d
+DOL=${WORKDIR}/sys/main.dol
+DOWNLOAD_LINK="https://www.dropbox.com/s/d2rb358ljcq21k5/Skyland.zip"
+RIIVOLUTION_ZIP="Skyland.zip"
+RIIVOLUTION_DIR="Skyland/Skyland"
+GAMENAME="Super Mario Skyland"
+XML_SOURCE="${RIIVOLUTION_DIR}"
+XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/Skyland.xml
+GAME_TYPE=RIIVOLUTION
+BANNER_LOCATION=${WORKDIR}/files/opening.bnr
+
+show_notes () {
+
+echo -e \
+"************************************************
+${GAMENAME}
+
+Super Mario Skyland is an Mini-Hack based on World 7 of NSMBWII.
+The goal of it was to replace every level including the ambush ones.
+The difficulty has been increased also so you might consider to die
+harder then in the Original. Even it was not tested in Multiplayer
+it may work or not.
+
+Source:			http://rvlution.net/thread/2153-super-mario-skyland/
+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
+	GAMEID=SMN${REG_LETTER}ZY
+
+}
+
+place_files () {
+
+	cp "${RIIVOLUTION_DIR}"/Stage/*.arc ${WORKDIR}/files/Stage/
+	cp "${RIIVOLUTION_DIR}"/Stage/Texture/* ${WORKDIR}/files/Stage/Texture/
+	cp "${RIIVOLUTION_DIR}"/Sound/*.brsar ${WORKDIR}/files/Sound/
+	cp "${RIIVOLUTION_DIR}"/Sound/Stream/* ${WORKDIR}/files/Sound/stream/
+
+}
+
+
+dolpatch () {
+
+	${WIT} dolpatch ${DOL}	\
+		"802F148C=53756D6D53756E#7769696D6A3264" \
+		"802F118C=53756D6D53756E#7769696D6A3264" \
+		"802F0F8C=53756D6D53756E#7769696D6A3264" \
+		xml="${PATCHIMAGE_PATCH_DIR}/NSMBW_AP.xml" -q
+
+}
+