safer uninstall v2 -- ds mode tests, uninstall all dsiware, nand backup, system format

The changes in this commit aren't final and need to be reviewed/probably reworded, as they might seem wordy or overly protective for the user.

_pages/en_US/uninstall-cfw.txt

@@ -8,14 +8,12 @@ title: "Uninstall CFW"
 
 This will completely remove CFW from your device, including boot9strap and Luma3DS, for the purpose of restoring the device to stock.
 
-This is almost never the solution to fix any issues you encounter with your CFW installation. A better idea would be to read the [troubleshooting](troubleshooting) page or ask (in English) for help at [Nintendo Homebrew on Discord](https://discord.gg/MWxPgEp).
+This is never the solution to fix any issues you may be encountering with your CFW installation. A better idea would be to ask (in English) for help at [Nintendo Homebrew on Discord](https://discord.gg/MWxPgEp).
 {: .notice--danger}
 
 Any unsigned (illegitimate) games will be rendered unusable and should be manually removed before starting this process by using the Data Management section of the System Settings. Use a [save manager](https://github.com/FlagBrew/Checkpoint/releases/latest) to backup any saves for these unsigned (illegitimate) games you care about.
 
-This will not affect your NNID, any legitimately purchased games, or any saves for those legitimately purchased games.
+If you have modified critical system software (such as editing the home menu, unbanning your console, etc), uninstalling CFW WILL BRICK your device! Ensure that you follow all sections of this page.
-
-If you have modified critical system software (such as editing the home menu, unbanning your console, etc), uninstalling CFW may BRICK your device!
 {: .notice--danger}
 
 Note that if you have any payload files other than `GodMode9.firm` in the `/luma/payloads/` folder on your SD card, holding (Start) on boot will display a "chainloader menu" where you will have to use the D-Pad and the (A) button to select "GodMode9" for these instructions. 
@@ -23,6 +21,7 @@ Note that if you have any payload files other than `GodMode9.firm` in the `/luma
 ### What You Need
 
 * The v1.9.2pre1 release of [GodMode9](https://github.com/d0k3/GodMode9/releases/tag/v1.9.2pre1)
++ The latest release of [DSiWare Uninstaller](https://github.com/MechanicalDragon0687/DSiWare-Uninstaller/releases/latest)
 * [safety_test.gm9](../../gm9_scripts/safety_test.gm9)
 
 ### Instructions
@@ -32,10 +31,35 @@ Note that if you have any payload files other than `GodMode9.firm` in the `/luma
 1. Insert your SD card into your computer
 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 `DSiWareUninstaller.3dsx` to the `/3ds/` folder on your SD card
 1. Copy `safety_test.gm9` to the `/gm9/scripts/` folder on your SD card
 1. Reinsert your SD card into your device
 
-#### Section II - Safety Test
+#### Section II - DS Mode Tests
+The purpose of this section is to check whether built-in DS mode applications will continue to work once CFW is uninstalled. If you skip this section, DS mode or its functions may be inaccessible until CFW is reinstalled.
+
+##### DS Connection Settings Test
+1. Power on your device
+1. Launch the System Settings Application
+1. Navigate to `Internet Settings` -> `Nintendo DS Connection Settings`, then click OK
+1. You should boot into the Nintendo DS Connection Setup menu
+  + If your console displays the Japanese version of Flipnote Studio, a black screen, or an error message, the test has failed
+1. Power off your device
+
+##### DS Download Play Test
+1. Power on your device
+1. Launch the Download Play application (![]({{ "/images/download-play-icon.png" | absolute_url }}){: height="24px" width="24px"})
+1. Select "Nintendo DS"
+1. If your device loads into a "Download software via DS Download Play" menu, the test was successful
+  + If your console displays the Japanese version of Flipnote Studio, a black screen, or an error message, the test has failed
+1. Power off your device
+
+If either of these tests has failed, DS mode, DS Download Play, and/or DS Connection Settings may be inaccessible once CFW is uninstalled! You should [fix DS mode](troubleshooting#dsi--ds-functionality-is-broken-after-completing-the-guide) before continuing.
+{: .notice--warning}
+
+#### Section III - Safety Test
+The purpose of this section is to verify that the console will boot and that critical system functions, like System Settings and the keyboard, will work once CFW is uninstalled. **If you skip this section, you may BRICK your device!**
+
 1. Launch GodMode9 by holding (Start) during boot
 1. If you are prompted to create an essential files backup, press (A) to do so, then press (A) to continue once it has completed
 1. If you are prompted to fix the RTC date&time, press (A) to do so, then set the date and time, then press (A) to continue
@@ -44,21 +68,8 @@ Note that if you have any payload files other than `GodMode9.firm` in the `/luma
 1. Select "Scripts..."
 1. Select "safety_test"
 1. Read the text on-screen and press (A) to continue
-1. You should boot into the regular 3DS Home Menu. If you do, power off your device and continue to the next section
+1. You should boot into the regular 3DS Home Menu. If you do, continue these instructions
-
+  + If you reach an error screen, uninstalling CFW **WILL BRICK YOUR DEVICE!** 
-If you do NOT boot into the regular 3DS Home Menu, continuing with these instructions **WILL BRICK** your device! Join [Nintendo Homebrew on Discord](https://discord.gg/MWxPgEp) and ask (in English) for someone there to assist you.
-{: .notice--danger}  
-
-#### Section III - Functionality Test
-The purpose of this section is to verify that certain critical functions on the 3DS are working properly when booted from a stock environment.
-
-##### System Settings and Keyboard Test
-1. Launch GodMode9 by holding (Start) during boot
-1. Press (Home) to bring up the action menu
-1. Select "Scripts..."
-1. Select "safety_test"
-1. Press (A) to continue
-  + You should boot into the regular 3DS Home Menu again
 1. Launch the System Settings Application
 	+ If the console crashes at this point, the test has failed
 1. Select "Other Settings"
@@ -68,36 +79,55 @@ The purpose of this section is to verify that certain critical functions on the
 	+ If the keyboard does not appear, the screen freezes, or the console crashes, the test has failed
 1. Power off your device
 
-##### DS Download Play / DS Mode Test
+If you do NOT boot into the regular 3DS Home Menu, or System Settings / your keyboard is inaccessible, **DO NOT continue with these instructions**! Join [Nintendo Homebrew on Discord](https://discord.gg/MWxPgEp) and ask (in English) for someone there to assist you.
+{: .notice--danger}  
+
+#### Section IV - NAND Backup
+
 1. Launch GodMode9 by holding (Start) during boot
 1. Press (Home) to bring up the action menu
-1. Select "Scripts..."
+1. Select "Scritps..."
-1. Select "safety_test"
+1. Select "GM9Megascript"
-1. Press (A) to continue
+1. Select "Backup Options"
-  + You should boot into the regular 3DS Home Menu again
+1. Select "SysNAND Backup"
-1. Launch the Download Play application (![]({{ "/images/download-play-icon.png" | absolute_url }}){: height="24px" width="24px"})
+1. Press (A) to confirm
-1. Select "Nintendo DS"
+  + This process will take some time
-1. If your device loads into a "Download software via DS Download Play" menu, the test was successful
+  + If you get an error, ensure you have at least 1.3GB of free space on your SD card
-	+ If the screen stays black, appears to freeze, or opens the JPN version of Flipnote Studio, the test has failed
+1. Press (B) to return to the main menu
-1. Power off your device
+1. Select “Exit”
+1. Press (Home) to bring up the action menu
+1. Select “Poweroff system” to power off your device
 
-If either of these tests has failed, continuing with these instructions WILL render certain features nonfunctional once CFW is uninstalled!
+#### Section V - Removing illegitimate content
+This section will remove illegitimate content, like homebrew and dumped cartridges. If you have save data that you care about, back it up with a save manager before continuing!
 {: .notice--warning}
 
-#### Section III - Prep Work
-
 1. Power on your device
-1. Navigate to System Settings > Data Management > Nintendo 3DS > Software
+1. Open the System Settings application
+1. Navigate to Data Management > Nintendo 3DS > Software
 1. In this list of software, delete any non-Nintendo content you installed while using CFW
-  + This includes common system software such as FBI, Anemone3DS, Luma Updater, Homebrew Launcher, Checkpoint, and others, along with any non-eShop games
+  + This includes common system software such as FBI, Anemone3DS, Luma Updater, Homebrew Launcher, Checkpoint, and others, along with any games and titles that you did *not* install from the eShop
 1. Navigate to Data Management > DSiWare
 1. In this list of software, delete any non-Nintendo content you installed while using CFW
-  + This includes software such as TWiLightMenu++, along with any non-eShop games
+  + This includes software such as TWiLightMenu++, along with any games and titles that you did *not* install from the eShop
   + Failure to remove all CFW software from both the 3DS and DSiWare sections before uninstalling CFW may prevent or disable access to the Data Management menu after uninstalling CFW
-1. Power off your device
+1. Exit the System Settings application
+1. Open the Homebrew Launcher application
+1. Launch DSiWare Uninstaller from the list of homebrew
+1. Follow the prompts and allow the program to uninstall 
+1. Once the process has succeeded, exit the Homebrew Launcher and power off your device
 
-#### Section IV - Running Uninstall Script
+#### Section VI - System Format
+This section will ensure that all illegitimate tickets are removed, allowing eShop to work normally. This will remove all content from the 3DS and log you out of your NNID. Keep in mind that your console's encryption key will be shuffled, meaning that any old data will be rendered inaccessible, even if you have a backup of your SD contents.
 
+1. Power on your device
+1. Open the System Settings application
+1. Navigate to Other Settings -> Next Page (four times) -> Format System Memory
+1. Follow the prompts to format your 3DS
+
+#### Section VII - Running Uninstall Script
+This is your final opportunity to verify that all safety steps above have been followed! Please ensure that you have followed all sections on this page, **especially** `Section III - Safety Test`, before continuing.
+{: .notice--warning}
 1. Launch GodMode9 by holding (Start) during boot
 1. Press (Home) to bring up the action menu
 1. Select "Scripts..."