From e31f2f12ba6991753c77125242330239c5949f37 Mon Sep 17 00:00:00 2001
From: Plailect <Plailect@gmail.com>
Date: Mon, 14 Aug 2017 15:56:09 -0400
Subject: [PATCH] Close #1279

---
 _pages/en_US/finalizing-setup.txt | 21 ++++++-----
 _pages/en_US/move-emunand.txt     |  2 +-
 gm9_scripts/cleanup_sd_card.gm9   | 58 +++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100644 gm9_scripts/cleanup_sd_card.gm9

diff --git a/_pages/en_US/finalizing-setup.txt b/_pages/en_US/finalizing-setup.txt
index a1b7349f36..ecc6fd0791 100644
--- a/_pages/en_US/finalizing-setup.txt
+++ b/_pages/en_US/finalizing-setup.txt
@@ -26,6 +26,7 @@ During this process, we also setup programs such as the following:
 * The latest release of [FBI](https://github.com/Steveice10/FBI/releases/latest) *(the `.cia` and `.3dsx` files)*
 * The latest fork of [Luma3DS Updater](https://github.com/KunoichiZ/lumaupdate/releases/latest) *(the `.cia` file)*
 * [`setup_ctrnand_luma3ds.gm9`]({{ base_path }}/gm9_scripts/setup_ctrnand_luma3ds.gm9)
+* [`cleanup_sd_card.gm9`]({{ base_path }}/gm9_scripts/cleanup_sd_card.gm9)
 
 #### Instructions
 
@@ -48,6 +49,7 @@ During this process, we also setup programs such as the following:
 1. Copy `GodMode9.firm` from the GodMode9 `.zip` to the `/luma/payloads/` folder on your SD card
 1. Copy the `gm9` folder from the GodMode9 `.zip` to the root of your SD card
 1. Copy `setup_ctrnand_luma3ds.gm9` to the `/gm9/scripts/` folder on your SD card
+1. Copy `cleanup_sd_card.gm9` to the `/gm9/scripts/` folder on your SD card
 
     ![]({{ base_path }}/images/screenshots/finalizing-setup-file-layout.png)
     {: .notice--info}
@@ -123,7 +125,16 @@ If, before following this guide, you already had an EmuNAND setup and would like
   + This backup will save you from a brick if anything goes wrong in the future
 1. Delete `<serialnumber>_nandmin_###.bin` from the `/gm9/out/` folder on your SD card after copying it
 1. Reinsert your SD card into your device
-1. Press (Start) to save and reboot
+
+##### Section VIII - Cleanup SD Card
+
+1. Press (Home) to bring up the action menu
+1. Select "More..."
+1. Select "Scripts..."
+1. Select "cleanup_sd_card"
+1. When prompted, press (A) to proceed
+1. Press (A) to continue
+1. Press (Start) to reboot
 
 ___
 
@@ -154,14 +165,6 @@ You can now press (L) + (Down) + (Select) while the system is booted to open the
 To use [NTR CFW](https://github.com/44670/BootNTR/), install [BootNTR Selector](https://gbatemp.net/threads/432911/).
 {: .notice--info}
 
-{% capture notice-7 %}
-Remove any extra files and folders from the root of your SD card that are *not* in the following image. If you have it, leave the `DCIM` folder as this contains any pictures taken with the 3DS camera:
-
-![]({{ base_path }}/images/screenshots/final-file-layout.png)
-{% endcapture %}
-
-<div class="notice--info">{{ notice-7 | markdownify }}</div>
-
 For information on changing your device to another region, check out the [Region Changing](region-changing) page.
 {: .notice--success}
 
diff --git a/_pages/en_US/move-emunand.txt b/_pages/en_US/move-emunand.txt
index 9ec5633647..24a7715bfc 100644
--- a/_pages/en_US/move-emunand.txt
+++ b/_pages/en_US/move-emunand.txt
@@ -150,7 +150,7 @@ If you did not backup GBA VC Saves earlier, skip this section.
   + Ensure you replace the `boot.firm` file on your SD card with the one from your backup
 1. Reinsert your SD card into your device
 1. Press (A) to remount your SD card
-1. Press (Start) to save and reboot
+1. Press (Start) to reboot
 1. If you get a black screen, [follow this troubleshooting guide](troubleshooting#ts_sys_down)
 
 ___
diff --git a/gm9_scripts/cleanup_sd_card.gm9 b/gm9_scripts/cleanup_sd_card.gm9
new file mode 100644
index 0000000000..ed9cb3adde
--- /dev/null
+++ b/gm9_scripts/cleanup_sd_card.gm9
@@ -0,0 +1,58 @@
+# last changed: 20170813
+# author: Some1CP
+ 
+set SUCCESSMSG "Cleanup completed successfully"
+set ERRORMSG "Cleanup failed"
+ 
+ask "This will clean the final setup files from your SD.\n\nContinue?"
+ 
+#allow SD modifications
+allow -a 0:/
+ 
+# remove existing files
+ #2xrsa
+rm -o -s 0:/arm9.bin
+rm -o -s 0:/arm11.bin
+ 
+#Cubic Ninja
+rm -o -s 0:/ntr.bin
+ 
+#Soundhax
+rm -o -s 0:/soundhax-usa-o3ds.m4a
+rm -o -s 0:/soundhax-usa-n3ds.m4a
+rm -o -s 0:/soundhax-eur-o3ds.m4a
+rm -o -s 0:/soundhax-eur-n3ds.m4a
+rm -o -s 0:/soundhax-jpn-o3ds.m4a
+rm -o -s 0:/soundhax-jpn-n3ds.m4a
+rm -o -s 0:/soundhax-kor-o3ds.m4a
+rm -o -s 0:/soundhax-kor-n3ds.m4a
+rm -o -s 0:/otherapp.bin
+rm -o -s 0:/3ds/safehax.3dsx
+rm -o -s 0:/3ds/udsploit.3dsx
+rm -o -s 0:/safehaxpayload.bin
+ 
+#DSiWareHax
+rm -o -s 0:/public.sav
+rm -o -s 0:/boot.nds
+rm -o -s 0:/savedata
+rm -o -s 0:/sudoku_v0.app
+rm -o -s 0:/4swords.app
+ 
+#ntrboot_flasher
+rm -o -s 0:/luma/payloads/ntrboot_flasher.firm
+rm -o -s 0:/ntrboot
+rm -o -s 0:/ntrboot.firm
+ 
+#Common files
+rm -o -s 0:/boot9strap
+rm -o -s 0:/cias
+rm -o -s 0:/gm9/scripts/setup_ctrnand_luma3ds.gm9
+rm -o -s "0:/gm9/scripts/Clean Setup Files.gm9"
+ 
+set ERRORMSG "Cleanup completed successfully"
+
+#GodMode9's out folder
+# Edited by Plailect--
+# I don't believe a prompt is needed for this since the instructions already told them to make a copy of their NAND backup
+#ask "Do you want to delete GM9's out folder, including\nyour NAND backups, from your SD?"
+rm -o -s $[GM9OUT]
\ No newline at end of file