From 0345439e4de818f00fa75cb643d0baaccec4f0df Mon Sep 17 00:00:00 2001 From: KazushiM <85604869+KazushiMe@users.noreply.github.com> Date: Wed, 7 Jul 2021 12:43:54 +0800 Subject: [PATCH] script update for HOS 12.1.0, dropping 12.0.x support --- README.md | 2 +- SdOut/patcher.te | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 09875116..14157994 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Overclocking suite for Switch(Erista and Mariko) running on Atmosphere CFW. **Steps:** -1. Make sure you are running targeted HOS (12.0.x and 12.1.0), and have `prod.keys` *with latest master key (0b for 12.1.0+)* dumped by [Lockpick_RCM](https://github.com/shchmue/Lockpick_RCM). +1. Make sure you are running targeted HOS (12.1.0), and have `prod.keys` *with latest master key (0b)* dumped by [Lockpick_RCM](https://github.com/shchmue/Lockpick_RCM). 2. Loader patches for Atmosphere: Grab from the web and apply. I won't provide them here. (Or build AMS with `ValidateAcidSignature()` stubbed.) diff --git a/SdOut/patcher.te b/SdOut/patcher.te index ec152c8b..36d1c22a 100644 --- a/SdOut/patcher.te +++ b/SdOut/patcher.te @@ -1,5 +1,5 @@ -pcvModulePath = "bis:/Contents/registered/875acbb5a5b6526159ac68a3c91884c7.nca/00" -OldBackupPath = "sd:/atmosphere/oc_patches/12-patch.bak" +pcvModulePath = "bis:/Contents/registered/3067dd44caacf32f8bca54ecde4c56e2.nca/00" +OldBackupPath = "sd:/atmosphere/oc_patches/12-1-patch.bak" BackupPath = "sd:/atmosphere/oc_patches/pcv-backup" PatchPath = "sd:/atmosphere/oc_patches/pcv-module" @@ -20,7 +20,7 @@ pausecont = { } header = { - println("\n-- Switch OC Suite Patcher --\n\n") + println("\n-- Switch OC Suite Patcher (HOS 12.1.0) --\n\n") println(" OC Suite is provided 'as is' without warranty of any kind,\n USE AT YOUR OWN RISKS!") println(" If you don't have Joy-Cons connected or are using Switch Lite,") println(" Press VOL+/- to navigate and POWER button to confirm.\n") @@ -56,28 +56,38 @@ if ( res == 2 || ( res == 1 && ! _EMU ) ) { println("SysMMC is selected!") wait(1000) if ( mmcConnect("SYSMMC") ) { + color("RED") println("An error occured during mmc connect!") + color("WHITE") pauseexit() } } +clearscreen() + println("Mounting SYSTEM Partition and Checking...") if ( mmcMount("SYSTEM") ) { + color("RED") println("An error occured during SYSTEM mount!") + color("WHITE") pauseexit() } if ( ! fileExists(pcvModulePath) ) { + color("RED") println("You're NOT using targeted Horizon OS version!") - println("Targeted version: 12.0.x\n") + println("Targeted version: 12.1.0\n") + color("WHITE") pauseexit() } if ( fileExists(OldBackupPath) ) { println("Old Backup found! Renaming...") if ( fileMove(OldBackupPath, BackupPath) ) { + color("RED") println("An error occured during renaming backup!") + color("WHITE") pauseexit() } } @@ -96,6 +106,7 @@ if ( res == 0 ) { } if ( res == 1 ) { + clearscreen() if ( fileExists(BackupPath) ) { color("RED") println("You have the backup already. Do you want to DELETE it and redump?") @@ -110,14 +121,17 @@ if ( res == 1 ) { } println("Dumping...") if ( fileCopy(pcvModulePath, BackupPath) ) { + color("RED") println("An error occured during dumping!") pauseexit() + color("WHITE") } println("Done! ") pauseexit() } if ( res == 2 ) { + clearscreen() if ( ! fileExists(PatchPath) ) { color("RED") println("Patched PCV Module NOT FOUND!") @@ -127,16 +141,21 @@ if ( res == 2 ) { } println("Applying Patched PCV Module...") if ( fileDel(pcvModulePath) && fileCopy(PatchPath, pcvModulePath) ) { + olor("RED") println("An error occured!") pauseexit() + color("WHITE") } println("Done! ") pauseexit() } if ( res == 3 ) { + clearscreen() if ( ! fileExists(BackupPath) ) { + color("RED") println("PCV Module Backup NOT FOUND!") + color("WHITE") pauseexit() } println("Restoring PCV Module...")