From ac1416761aa2796c6590ed0abdee3909235545b9 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 20 Aug 2016 12:17:34 +0200 Subject: [PATCH] add support for Challenging Super Mario Bros. Wii: Virtual Special automatic downloading is not possible from SendSpace, update downloader function to inform user to manually download from there fixed that the script did try to automatically download from mediafire instead of informing user to manually download update PKMN_ALL and NSMB_ALL batch-build shortcuts for new games --- ChangeLog | 5 ++ README.GAMEIDS | 1 + database/scripts.db | 1 + patchimage.sh | 4 +- scripts/common.sh | 11 +++- scripts/messages.sh | 2 + scripts/nsmbw/virtualspecial.sh | 94 +++++++++++++++++++++++++++++++++ 7 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 scripts/nsmbw/virtualspecial.sh diff --git a/ChangeLog b/ChangeLog index 6b8065f..4c3ac9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ v7.2.0: neither find a zip archive containing the patch, or the bare patch file - HANS patcher now supports applying DELTA patches - split out messages into message.sh +- automatic downloading is not possible from SendSpace, update downloader + function to inform user to manually download from there ::bug fixes - Pokemon Star Sapphire was accidently called Alpha Sapphire in the menu, @@ -22,6 +24,8 @@ v7.2.0: openingTitle.arc for PAL New Super Mario Bros. Wii - fixed black screen in Remixed Super Mario Bros. Wii by not applying the custom openingTitle.arc for PAL and JAP New Super Mario Bros. Wii +- fixed that the script did try to automatically download from mediafire instead + of informing user to manually download ::command line parameters - add batch building short cuts for --game parameter: @@ -51,6 +55,7 @@ v7.2.0: :::New Super Mario Bros. Wii - add support for Cliff Super Mario Bros. Wii (SCL[PUJ]01) +- add support for Challenging Super Mario Bros. Wii: Virtual Special (SMN[PUJ]ZC) :::Pokemon - add support for Pokemon Red Ruby diff --git a/README.GAMEIDS b/README.GAMEIDS index b88f7b9..eb8a2a4 100644 --- a/README.GAMEIDS +++ b/README.GAMEIDS @@ -37,6 +37,7 @@ SMN?MI Midi's Super Mario Bros Wii - Just A Little Adventure SMN?RV RVLution Wii (NewSMB Mod) SMN?YL Luigi's Super Yoshi Bros. SMN?ZA Newer Apocalypse +SMN?ZC Challenging Super Mario Bros. Wii: Virtual Special SMN?ZY Super Mario Skyland SMM?02 Super Mario: Mushroom Adventure PLUS - Winter Moon SMV?01 Super Mario Vacation diff --git a/database/scripts.db b/database/scripts.db index ca899c9..c0951bb 100644 --- a/database/scripts.db +++ b/database/scripts.db @@ -26,6 +26,7 @@ NSMB25:GhostlySuperGhostBoos:nsmbw/ghostlysuperghostbooswii.sh NSMB26:RevisedSuperMarioBros:nsmbw/revisedsupermariobroswii.sh NSMB27:MLGSuperLuigi:nsmbw/mlgsuperluigibroswii.sh NSMB28:Cliff:nsmbw/cliffsmb.sh +NSMB29:Virtual:nsmbw/virtualspecial.sh NSMB99:NSMBWCharacters:nsmbw/nsmbw_characters.sh MKW1:Wiimmfi:mkwii/wiimmfi.sh MKW2:Wiimmpatch:wiimmfi_generic.sh diff --git a/patchimage.sh b/patchimage.sh index 1a4b56e..335c582 100755 --- a/patchimage.sh +++ b/patchimage.sh @@ -273,11 +273,11 @@ patchimage_delta () { for game in ${GAME[@]}; do case ${game} in NSMB_ALL ) - NEW_GAME=(${NEW_GAME[@]} NSMB{1..12} NSMB{14..27}) + NEW_GAME=(${NEW_GAME[@]} NSMB{1..12} NSMB{14..29}) ;; PKMN_ALL ) - NEW_GAME=(${NEW_GAME[@]} PKMN{1..9}) + NEW_GAME=(${NEW_GAME[@]} PKMN{1..10}) ;; PKMN_Y ) diff --git a/scripts/common.sh b/scripts/common.sh index cab68ed..ea25f85 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -337,10 +337,19 @@ download_riivolution_patch () { exit 21 ;; - *medafire* ) + *mediafire* ) x=6 echo "can not download from Mediafire, download manually from: + ${DOWNLOAD_LINK} +" + exit 21 + ;; + + *sendspace* ) + x=6 + echo "can not download from SendSpace, download manually from: + ${DOWNLOAD_LINK} " exit 21 diff --git a/scripts/messages.sh b/scripts/messages.sh index ffa6fa8..26036fa 100644 --- a/scripts/messages.sh +++ b/scripts/messages.sh @@ -34,6 +34,7 @@ NSMB25 GhostlySuperGhostBoos Ghostly Super Ghost Boos. Wii NSMB26 RevisedSuperMarioBros Revised Super Mario Bros. Wii NSMB27 MLGSuperLuigi MLG Super Luigi Bros. Wii NSMB28 Cliff Cliff Super Mario Bros. Wii +NSMB29 Virtual Challenging Super Mario Bros. Wii: Virtual Special NSMB99 NSMBWCharacters Customize Characters @@ -136,6 +137,7 @@ NSMB25 GhostlySuperGhostBoos GSGBW v1.0.2.zip NSMB26 RevisedSuperMarioBros RSMBW Version 1.0.zip NSMB27 MLGSuperLuigi MLGLuigiWii.zip NSMB28 Cliff Cliff_Super_Mario_Brothers_Wiiv1.0b.zip +NSMB29 Virtual ChaSMBW_VrS_v0.2.zip NSMB99 NSMBWCharacters Alternative Character Files are supplied " diff --git a/scripts/nsmbw/virtualspecial.sh b/scripts/nsmbw/virtualspecial.sh new file mode 100644 index 0000000..65b956f --- /dev/null +++ b/scripts/nsmbw/virtualspecial.sh @@ -0,0 +1,94 @@ +#!/bin/bash + +WORKDIR=nsmb.d +DOL=${WORKDIR}/sys/main.dol +DOWNLOAD_LINK="https://www.sendspace.com/file/cky4rn" +RIIVOLUTION_ZIP="ChaSMBW_VrS_v0.2.zip" +RIIVOLUTION_DIR="VirtualChallenging" +GAMENAME="Challenging Super Mario Bros. Wii: Virtual Special" +GAME_TYPE=RIIVOLUTION +XML_SOURCE="${RIIVOLUTION_DIR}" +XML_FILE="${RIIVOLUTION_DIR}"/../riivolution/VirtualSpecial.xml +BANNER_LOCATION=${WORKDIR}/files/opening.bnr +WBFS_MASK="SMN[PEJ]01" + +show_notes () { + +echo -e \ +"************************************************ +${GAMENAME} + +This is a mini hack that has Virtual Day for all those +Computer Lovers who are waiting for Challenging! + +Source: http://rvlution.net/thread/2535-challenging-super-mario-bros-wii-virtual-special/ +Base Image: New Super Mario Bros. Wii (SMN?01) +Supported Versions: EURv1, EURv2, USAv1, USAv2, JPNv1 +************************************************" + +} + +detect_game_version () { + + nsmbw_version + GAMEID=SMN${REG_LETTER}ZC + +} + +place_files () { + + case ${VERSION} in + EUR* ) + LANGDIRS=( EngEU FraEU GerEU ItaEU SpaEU ) + for dir in "${LANGDIRS[@]}"; do + cp "${RIIVOLUTION_DIR}"/Message/Message.arc "${WORKDIR}"/files/EU/"${dir}"/Message/Message.arc + #cp "${RIIVOLUTION_DIR}"/Layout/wiiStrap.arc "${WORKDIR}"/files/EU/"${dir}"/Layout/wiiStrap/ + done + cp -r "${RIIVOLUTION_DIR}"/OpeningP/openingTitle.arc "${WORKDIR}"/files/EU/Layout/openingTitle/ + ;; + + USAv* ) + LANGDIRS=( FraUS EngUS SpaUS ) + for dir in "${LANGDIRS[@]}"; do + cp "${RIIVOLUTION_DIR}"/Message/Message.arc "${WORKDIR}"/files/US/"${dir}"/Message/Message.arc + cp "${RIIVOLUTION_DIR}"/Layout/wiiStrap.arc "${WORKDIR}"/files/US/"${dir}"/Layout/wiiStrap/ + done + cp -r "${RIIVOLUTION_DIR}"/OpeningE/openingTitle.arc "${WORKDIR}"/files/US/Layout/openingTitle/ + ;; + + JPNv1 ) + cp "${RIIVOLUTION_DIR}"/Message/Message.arc "${WORKDIR}"/files/JP/Message/Message.arc + #cp "${RIIVOLUTION_DIR}"/Layout/wiiStrap.arc "${WORKDIR}"/files/JP/Layout/wiiStrap/ + cp -r "${RIIVOLUTION_DIR}"/OpeningJ/openingTitle.arc "${WORKDIR}"/files/JP/Layout/openingTitle/ + ;; + esac + + cp -r "${RIIVOLUTION_DIR}"/FuncInfo "${WORKDIR}"/files/ + cp "${RIIVOLUTION_DIR}"/Sound/stream/*.brstm "${WORKDIR}"/files/Sound/stream/ + cp "${RIIVOLUTION_DIR}"/Sound/*.brsar "${WORKDIR}"/files/Sound/ + cp "${RIIVOLUTION_DIR}"/Stage/*.arc "${WORKDIR}"/files/Stage/ + cp "${RIIVOLUTION_DIR}"/Stage/Texture/* "${WORKDIR}"/files/Stage/Texture/ + cp "${RIIVOLUTION_DIR}"/WorldMap/* "${WORKDIR}"/files/WorldMap/ + cp "${RIIVOLUTION_DIR}"/Layout/sequenceBGTexture.arc \ + "${WORKDIR}"/files/Layout/textures/sequenceBGTexture.arc + + for file in charaChangeSelectContents corseSelectUIGuide gameScene \ + MultiCourseSelect MultiCourseSelectContents pointResult \ + pointResultDateFile pointResultDateFileFree preGame sequenceBG; do + cp "${RIIVOLUTION_DIR}"/Layout/"${file}".arc \ + "${WORKDIR}"/files/Layout/"${file}"/"${file}".arc + done + +} + +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 + +}