Move autobooting steps to autobooting section (#211)

* Move autobooting steps to autobooting section

* Add macOS merge note

Co-authored-by: Lazr <68634861+Lazr1026@users.noreply.github.com>

docs/sidebar.md

@@ -1,7 +1,6 @@
 - **User Guide**
 - [Introduction](introduction)
 - [Aroma](aroma/getting-started)
-- **vWii**
 - [vWii Modding](vwii/sd-preparation)
 - **Troubleshooting**
 - [Common Issues & Fixes](common-issues-fixes)

docs/user-guide/aroma/autoboot.md

@@ -4,6 +4,7 @@
 
 Currently, every time you want to launch Aroma you will have to launch the Health and Safety information app. If you wish to automatically launch into Aroma on every boot, you can autoboot the Health and Safety Information app.
 
+If you don't want to autoobot Aroma, you can skip this step and follow the Setting Up PayloadLoader section below.
 ### Instructions
 
 1. Start the console to boot into the Wii U Menu, launch the Health and Safety Information app.
@@ -15,6 +16,19 @@ Currently, every time you want to launch Aroma you will have to launch the Healt
 1. You will be asked if you want to switch the boot title. Press A to select `Switch to PayloadLoader`.
 1. When the process has finished, press A to shutdown the console.
 1. The PayloadLoader will now be launched automatically on every boot.
-    - To change the default boot title hold Start (+) on the Gamepad while booting the console.
+
+### Setting up PayloadLoader, Environment Loader and Aroma
+Now, we are going to make the Aroma environment start automatically when your console loads the Health and Safety Information app and select Wii U Menu as the default boot option.
+1. Launch the EnvironmentLoader.
+    - If you are autobooting the PayloadLoader, simply turn on your Wii U.
+    - If you skipped the autobooting steps, launch the Health and Safety Information app.
+1. Using the D-Pad, navigate to `aroma` and press Y to set this to your default environment, then press A to launch into Aroma.
+    - You might get a red warning screen telling you that updates aren't blocked properly. Press A to continue anyway. We're going to block updates in the "Blocking Updates" section below.
+    - To open the Environment Loader in the future, you have to hold X while your Wii U is booting or loading the Health and Safety Information app.
+
+1. On the Aroma Boot Selector, the `Wii U Menu` should already be selected, press Y to set this to your default autobooting option, then press A to launch into the Wii U Menu.
+   
+1. Aroma will now be launched each time you boot the console (or load Health and Safety) and then straight into the Wii U Menu.
+    - To open the Aroma Boot Selector in the future, you have hold START (+) while the console is booting or loading the Health and Safety Information app.
     - Navigate the list using the D-Pad to hover on the title you want to autoboot in, then press the Y button to set this to your autoboot title.
     - Press A to launch the selected title.

docs/user-guide/aroma/finalizing-setup.md

@@ -4,19 +4,6 @@
 
 Now that PayloadLoader, Environment Loader and Aroma are installed, we are going to finalize the setup.
 
-We are going to make the Aroma environment start automatically when your console autoboots the Health and Safety Information app (or when manually launching it if you chose not to autoboot it) and select Wii U Menu as default as well as getting additional homebrew apps. Please note that the following steps assumes you are autobooting the Health and Safety Information app.
-
-### Setting up PayloadLoader, Environment Loader and Aroma
-
-1. Launch the EnvironmentLoader.
-    - If you are autobooting the PayloadLoader, simply turn on your Wii U.
-    - If you skipped the autobooting steps, launch the Health and Safety Information app.
-1. Using the D-Pad, navigate to `aroma` and press Y to set this to your default environment, then press A to launch into Aroma.
-    - You might get a red warning screen telling you that updates aren't blocked properly. Press A to continue anyway. We're going to block updates in the "Blocking Updates" section below.
-    - To open the Environment Loader in the future, you have to hold X while your Wii U is booting or loading the Health and Safety Information app.
-1. On the Aroma Boot Selector, the `Wii U Menu` should already be selected, press Y to set this to your default autobooting option, then press A to launch into the Wii U Menu.
-    - To open the Aroma Boot Selector in the future, you have hold START (+) while the console is booting or loading the Health and Safety Information app.
-
 ### Blocking Updates
 While Aroma's PayloadLoader already has built-in update blocking functionality, it is recommended to delete the update folder to effectively block system updates.
 If you get a red warning screen while booting into Tiramisu, the update folder still exists and it is recommended to delete it using [this guide](../block-updates).

docs/user-guide/aroma/sd-preparation.md

@@ -22,7 +22,9 @@ We will now place the required Aroma files on the SD Card.
 1. **Extract** and copy the `wiiu` folder of the three newly downloaded *`.zip`* files to the root of your SD Card.
     - The three `wiiu` folders should be merged if not done automatically.
 
-?> If your computer asks you to overwrite existing files on your SD Card, you will need to click yes.
+?> If your computer asks you to overwrite existing files on your SD Card, you will need to click yes. 
+
+?> If you're on a Mac machine, select `Merge` instead of replace. If the merge option does not show immediately, press and hold the `Option` key while moving files to the root.
 
 ----------
 

docs/user-guide/vwii/installing-cioses.md

@@ -2,8 +2,6 @@
 
 ## Installing cIOSes
 
-!> Make sure you have no `.wad` files anywhere else than in the `apps` folder on your SD Card.
-
 1. Power on your Wii U and launch vWii.
 1. Launch The Homebrew Channel.
 1. Launch d2x cIOS Installer.

docs/user-guide/vwii/installing-homebrewchannel.md

@@ -2,9 +2,8 @@
 
 ## Installing the Homebrew Channel
 
-1. Boot into [Tiramisu](browser-exploit).
-1. Launch the Homebrew Launcher, by opening the Mii Maker.
-1. Launch the vWii Compat Installer.
+1. Boot into [Aroma](browser-exploit).
+1. Launch the `vWii Compat Installer` from the Wii U Menu.
 1. Press `A` to install the Homebrew Channel and wait until you see `Install succeeded`. Then press the HOME button to return to the Wii U Menu.
 1. Launch vWii (the Wii Menu icon).
    - If the installation has succeeded, you should see the Homebrew Channel in your Wii Menu.

docs/user-guide/vwii/nand-backup.md

@@ -2,7 +2,7 @@
 
 ## NAND Backup
 
-In case anything goes wrong in the later process and your vWii ends up bricked, restoring a previously made NAND backup can fix it.
+In case anything goes wrong in the later process and your vWii ends up bricked, restoring a previously made NAND backup can fix it, or you can completely [reinstall the vWii](http://wiiu.hacks.guide/#/recover-vwii-ioses-channels).
 
 ?> If you have recently made a NAND backup that includes SLCCMPT and OTP, feel free to skip this step.
 

docs/user-guide/vwii/sd-preparation.md

@@ -10,13 +10,15 @@ We will now start by placing the required Homebrew files on the SD Card.
     Your SD Card will need to be formatted as FAT32. If your SD Card is not formatted to FAT32, use [GUIFormat](http://ridgecrop.co.uk/index.htm?guiformat.htm) with 32k (32768) Allocation unit size to format it. **Do not** label the SD Card as `wiiu` or it will cause issues with homebrew.
     
 ?> If you have hacked your Wii U in the past, you can use the same SD Card for this process.
-    
+
+?> Unlike Wii U homebrew, vWii apps go in a separate apps folder on the root. Compat Installer is the **only** Wii U app here. 
 
 ### What You Need
 
-- The latest files from [Tiramisu for your café](https://tiramisu.foryour.cafe).
-    - Click on `Download Tiramisu`.
-    - If you have already installed Tiramisu, you do not need to redownload it.
+- The latest files from [Aroma for your café](https://aroma.foryour.cafe).
+    - Click on `Download Payloads`and `Download Base Aroma`.
+    - Read through the steps and click on the checkboxes.
+    - If you have already installed Aroma, you do not need to redownload it.
 - The latest release of the [Compat Title Installer](https://hb-app.store/wiiu/CompatTitleInstaller).
 - The <a href="docs/files/Patched_IOS80_Installer_for_vWii.zip" download>Patched IOS 80 Installer for vWii</a>. ([Source](https://github.com/Lazr1026/Patched-IOS80-Installer-for-vWii))
 - The <a href ="docs/files/d2x_cIOS_Installer.zip" download>d2x cIOS Installer</a>.
@@ -26,6 +28,6 @@ We will now start by placing the required Homebrew files on the SD Card.
 1. Insert your Wii U's SD Card into your PC.
 1. Copy the `apps` folder from the `Patched_IOS80_Installer_for_vWii.zip` file to the root of your SD Card.
 1. Copy the `d2x-cios-installer` from the `d2x_cIOS_Installer.zip` file to the apps folder on the root of your SD Card.
-1. Copy the contents of the downloaded Tiramisu *`.zip`* file to the root of your SD Card.
+1. Copy the contents of the downloaded Base Aroma and payloads `.zip` files to the root of your SD Card.
 1. Copy the contents of the `CompatTitleInstaller.zip` file to the root of your SD Card.
 1. Take the SD Card out of your computer and plug it into your Wii U console.