Skip to content
Permalink
Browse files

Merge pull request #84 from julesontheroad/Beta

0.96b. Fix
  • Loading branch information
julesontheroad committed Oct 30, 2019
2 parents 2eff323 + 943148c commit 562261a4fc28299ab698c747c5bf7d998319b98a
Showing with 92 additions and 9 deletions.
  1. +6 −3 py/Linked_Account_Patchable_Games.txt
  2. +82 −2 py/NSCB.bat
  3. +4 −4 py/ztools/squirrel.py
@@ -20,7 +20,6 @@ Arena of Valor BETA [DEMO][0100944009646000][v0][US].nsp - YES
Arena of Valor BETA [DEMO][UPD][0100944009646800][v65536][WORLD].nsp - YES
Arena of Valor [BASE][01008D8006A6A000][v0][US].nsp - YES
Arena of Valor [UPD][01008D8006A6A800][v458752][WORLD].nsp - YES
Asphalt 9 Legends [01007B000C834000][v0].nsp - NO
Awkward [BASE][010073900A7A0000][v0][US].nsp - YES
Bloodstained Ritual of the Night [BASE][0100BF500207C000][v0][US].nsp - YES
Bloodstained Ritual of the Night [UPD][0100BF500207C800][v131072][WORLD].nsp - YES
@@ -35,7 +34,6 @@ DOOM II Classic [BASE][0100D4F00DD02000][v0][US].nsp - YES (NEEDS SAVE IMPORT WI
DOOM II Classic [UPD][0100D4F00DD02800][v65536][WORLD].nsp - YES (NEEDS SAVE IMPORT WITH BNET ACCOUNT LINKED)
Elemental Knights R [BASE][01005FA009370000][v0][US].nsp - YES
Elemental Knights R [UPD][01005FA009370800][v262144][US].nsp - YES
Eternal Card Game [0100F0B00A214000][v0].nsp - NO
Fallout Shelter [BASE][010043500A17A000][v0][US].nsp - YES
Fallout Shelter [UPD][010043500A17A800][v131072][WORLD].nsp - YES
Fortnite [BASE][010025400AECE000][v0][US].nsp - YES
@@ -49,6 +47,7 @@ Lightseekers [UPD][01009EA00C792800][v196608][US].nsp - YES
Magic Nations [BASE][0100F6600AC00000][v0][US].nsp - YES
Mercury Race [BASE][0100C9A00B60A000][v0][US].nsp - YES
Mercury Race [UPD][0100C9A00B60A800][v196608][US].nsp - YES
MilkChoco [010056D00B0F4800][v65536].nsp - YES
Modern Combat Blackout [BASE][0100D8700B712000][v0][US].nsp - YES
Modern Combat Blackout [UPD][0100D8700B712800][v196608][US].nsp - YES
Next Up Hero [BASE][0100271004570000][v0][US].nsp - YES
@@ -89,11 +88,14 @@ Warhammer Age of Sigmar Champions [UPD][010089A00C7B0800][v262144][US].nsp - YES
-------------------------------------------------------------------------------------
NOT PATCHABLE IN NSCB_V0.92
-------------------------------------------------------------------------------------
Asphalt 9 Legends [01007B000C834000][v0].nsp - NO
Asphalt 9 Legends [01007B000C834800][v65536].nsp - NO
BIOHAZARD 7 resident evil cloud version [BASE][01006EA00A294000][v0][JP].nsp - NO
Danger Mouse The Danger Games [BASE][01003ED0099B0000][v0][US].nsp - NO
Dead by Daylight [01004C400CF96000][v0].nsp - NO
Dead by Daylight [UPD][01004C400CF96800][v65536][WORLD].nsp - NO
Eiyudensetu AkatukinoKiseki Mobile [0100D4900DEF4000][v0].nsp
Eternal Card Game [0100F0B00A214000][v0].nsp - NO
Eternal Card Game [0100F0B00A214800][v196608].nsp - NO
GALAK-Z Variant S [BASE][0100C9800A454000][v0][US].nsp - NO
GALAK-Z Variant S [UPD][0100C9800A454800][v131072][US].nsp - NO
@@ -103,6 +105,7 @@ GetAmped Mobile [BASE][0100AA4008210000][v0][US].nsp - NO
GetAmped Mobile [UPD][0100AA4008210800][v589824][US].nsp - NO
Growtopia [BASE][010065F00BE6C000][v0][US].nsp - NO
Growtopia [UPD][010065F00BE6C800][v131072][US].nsp - NO
MilkChoco [BASE][010056D00B0F4000][v0][US].nsp - NO (requires patch)
Mordheim Warband Skirmish [BASE][010071B009FB6000][v0][US].nsp - NO
Mordheim Warband Skirmish [UPD][010071B009FB6800][v131072][WORLD].nsp - NO
Nintendo Entertainment System - Nintendo Switch Online [BASE][0100D870045B6000][v0][US].nsp - NO
@@ -145,7 +148,7 @@ Doragonkuesuto Ⅹ onrain be-ta han [DEMO][UPD][0100459000302800][v327680][JAP].
血咒之城:暗夜儀式 [BASE][010025A00DF2A000][v0][HK].nsx - UNTESTED
Rally Rock 'N Racing [0100AFA00F048000][v0].nsx - UNTESTED
Overwatch Legendary Edition [0100F8600E21E800][v65536].nsp - UNTESTED
MilkChoco [010056D00B0F4800][v65536].nsp - UNTESTED


-------------------------------------------------------------------------------------
Thanks to my good friend "the tester"
@@ -171,6 +171,50 @@ echo DONE
call :thumbup
)

::*************
::FOR NSZ FILES
::*************
for /r "%~1" %%f in (*.nsz) do (
set "target=%%f"
if exist "%w_folder%" RD /s /q "%w_folder%" >NUL 2>&1

set "filename=%%~nf"
set "orinput=%%f"
set "showname=%orinput%"

MD "%w_folder%"
REM echo %safe_var%>safe.txt
call :squirrell

if "%zip_restore%" EQU "true" ( set "ziptarget=%%f" )
if "%zip_restore%" EQU "true" ( call :makezip )
call :getname
REM setlocal enabledelayedexpansion
REM set vpack=!vrepack!
REM endlocal & ( set "vpack=!vrepack!" )

REM if "%trn_skip%" EQU "true" ( call :check_titlerights )
if "%vrename%" EQU "true" ( call :addtags_from_nsp )

if "%vrepack%" EQU "nsp" ( %pycommand% "%nut%" %buffer% %patchRSV% %vkey% %capRSV% %fatype% %fexport% %skdelta% -o "%w_folder%" -t "nsp" -dc "%%f" )
if "%vrepack%" EQU "xci" ( %pycommand% "%nut%" %buffer% %patchRSV% %vkey% %capRSV% %fatype% %fexport% %skdelta% -o "%w_folder%" -t "xci" -dc "%%f" )
if "%vrepack%" EQU "both" ( %pycommand% "%nut%" %buffer% %patchRSV% %vkey% %capRSV% %fatype% %fexport% %skdelta% -o "%w_folder%" -t "both" -dc "%%f" )

if not exist "%fold_output%" MD "%fold_output%" >NUL 2>&1

move "%w_folder%\*.xci" "%fold_output%" >NUL 2>&1
move "%w_folder%\*.xc*" "%fold_output%" >NUL 2>&1
move "%w_folder%\*.nsp" "%fold_output%" >NUL 2>&1
move "%w_folder%\*.ns*" "%fold_output%" >NUL 2>&1
if exist "%w_folder%\*.zip" ( MD "%zip_fold%" ) >NUL 2>&1
move "%w_folder%\*.zip" "%zip_fold%" >NUL 2>&1
if exist "%w_folder%\archfolder" ( %pycommand% "%nut%" -ifo "%w_folder%\archfolder" -archive "%fold_output%\%filename%.nsp" )

RD /S /Q "%w_folder%" >NUL 2>&1
echo DONE
call :thumbup
)

::FOR XCI FILES
for /r "%~1" %%f in (*.xci) do (
if exist "%w_folder%" rmdir /s /q "%w_folder%" >NUL 2>&1
@@ -205,6 +249,40 @@ ECHO *********** ALL FILES WERE PROCESSED! *************
ECHO ---------------------------------------------------
goto aut_exit_choice

::FOR XCZ FILES
for /r "%~1" %%f in (*.xcz) do (
if exist "%w_folder%" rmdir /s /q "%w_folder%" >NUL 2>&1
set "filename=%%~nf"
set "orinput=%%f"
set "showname=%orinput%"

MD "%w_folder%"
call :getname
if "%vrename%" EQU "true" ( call :addtags_from_xci )

if "%vrepack%" EQU "nsp" ( %pycommand% "%nut%" %buffer% %patchRSV% %vkey% %capRSV% %fatype% %fexport% %skdelta% -o "%w_folder%" -t "nsp" -dc "%%f" )
if "%vrepack%" EQU "xci" ( %pycommand% "%nut%" %buffer% %patchRSV% %vkey% %capRSV% %fatype% %fexport% %skdelta% -o "%w_folder%" -t "xci" -dc "%%f" )
if "%vrepack%" EQU "both" ( %pycommand% "%nut%" %buffer% %patchRSV% %vkey% %capRSV% %fatype% %fexport% %skdelta% -o "%w_folder%" -t "both" -dc "%%f" )

if not exist "%fold_output%" MD "%fold_output%" >NUL 2>&1

move "%w_folder%\*.xci" "%fold_output%" >NUL 2>&1
move "%w_folder%\*.xc*" "%fold_output%" >NUL 2>&1
move "%w_folder%\*.nsp" "%fold_output%" >NUL 2>&1
move "%w_folder%\*.ns*" "%fold_output%" >NUL 2>&1
if exist "%w_folder%\*.zip" ( MD "%zip_fold%" ) >NUL 2>&1
move "%w_folder%\*.zip" "%zip_fold%" >NUL 2>&1
if exist "%w_folder%\archfolder" ( %pycommand% "%nut%" -ifo "%w_folder%\archfolder" -archive "%fold_output%\%filename%.nsp" )

RD /S /Q "%w_folder%" >NUL 2>&1
echo DONE
call :thumbup
)
ECHO ---------------------------------------------------
ECHO *********** ALL FILES WERE PROCESSED! *************
ECHO ---------------------------------------------------
goto aut_exit_choice

:folder_ind_mode_fat32
CD /d "%prog_dir%"
call :program_logo
@@ -310,7 +388,7 @@ MD "%w_folder%"
if exist "%prog_dir%mlist.txt" del "%prog_dir%mlist.txt" >NUL 2>&1

echo - Generating filelist
%pycommand% "%nut%" -t nsp xci -tfile "%prog_dir%mlist.txt" -ff "%~1"
%pycommand% "%nut%" -t nsp xci nsz xcz -tfile "%prog_dir%mlist.txt" -ff "%~1"
echo DONE

if "%vrepack%" EQU "nsp" echo ......................................
@@ -466,6 +544,8 @@ goto s_KeyChange_skip
call :program_logo
if "%~x1"==".nsp" ( goto nsp )
if "%~x1"==".xci" ( goto xci )
if "%~x1"==".nsz" ( goto nsp )
if "%~x1"==".xcz" ( goto xci )
if "%~x1"==".*" ( goto other )
:other
echo No valid file was dragged. The program only accepts xci or nsp files.
@@ -1541,7 +1621,7 @@ ECHO *************************************************
echo Or Input "0" to return to the MODE SELECTION MENU
ECHO *************************************************
echo.
%pycommand% "%nut%" -t nsp xci -tfile "%prog_dir%mlist.txt" -uin "%uinput%" -ff "uinput"
%pycommand% "%nut%" -t nsp xci nsz xcz -tfile "%prog_dir%mlist.txt" -uin "%uinput%" -ff "uinput"
set /p eval=<"%uinput%"
set eval=%eval:"=%
setlocal enabledelayedexpansion
@@ -6592,7 +6592,7 @@
#print(basename)
#print(check)
if renmode != "force":
if basename2.find(check) is not -1:
if basename2.find(check) != -1:
print('Filename: '+basename)
print(tabs+"> File already has correct id: "+baseid)
counter=int(counter)
@@ -6620,7 +6620,7 @@
basename2=basename.upper()
check=str('['+updid+']').upper()
if renmode != "force":
if basename2.find(check) is not -1:
if basename2.find(check) != -1:
basename=os.path.basename(os.path.abspath(filepath))
print('Filename: '+basename)
print(tabs+"> File already has correct id: "+updid)
@@ -6649,7 +6649,7 @@
basename2=basename.upper()
check=str('['+dlcid+']').upper()
if renmode != "force":
if basename2.find(check) is not -1:
if basename2.find(check) != -1:
print('Filename: '+basename)
print(tabs+"> File already has correct id: "+dlcid)
counter=int(counter)
@@ -7677,7 +7677,7 @@
if filename.endswith('.nca'):
try:
f = Fs.Nca(filename, 'rb')
ver_,origheader,ncaname,feed,currkg=f.verify(False)
ver_,origheader,ncaname,feed,currkg,tr,tkey,iGC=f.verify(False)
f.flush()
f.close()
if not args.text_file:

0 comments on commit 562261a

Please sign in to comment.
You can’t perform that action at this time.