Revert "Add Instruction on Joining Split Files" and do it properly th…

…is time (#302)

* Revert "Add Instruction on Joining Split Files (#301)"

This reverts commit 89fef48.

* actually did it this time lol

* fixed buttons and placement of things

_pages/en_US/cios.md

@@ -16,74 +16,90 @@ If you have a Wii mini, install [this cIOS](cios-mini) instead. Attempting to in
 
 #### What you need
 
-* A Wii with an Internet connection
-* An SD card or USB drive
-* [d2x cIOS Installer](https://hbb1.oscwii.org/hbb/d2x-cios-installer/d2x-cios-installer.zip)
+- A Wii
+- An SD card or USB drive
+- [d2x cIOS Installer](https://hbb1.oscwii.org/hbb/d2x-cios-installer/d2x-cios-installer.zip)
 
 Ensure that if you are using an SD card, the lock switch is in the unlocked position, otherwise you will not be able to select the correct options in the installer
 {: .notice--warning}
 
 #### Instructions
 
+<button class="tablinks btn btn--large btn--primary" id="defaultOpen" onclick="openTab(event, 'with-connection')">With an Internet connection to the Wii</button>
+<button class="tablinks btn btn--large btn--info" onclick="openTab(event, 'without-connection')">Without an Internet connection to the Wii</button>
+
+<div id="with-connection" class="blanktabcontent" markdown="1">
+
 ##### Section I - Downloading
 
-1. Download d2x cIOS Installer and extract it to your SD card or USB drive.
-1. Insert your SD card or USB drive into your Wii, and launch d2x cIOS Installer from the Homebrew Channel.
+1. Download the d2x cIOS Installer and extract it to the root of your SD card or USB drive.
+1. Insert your SD card or USB drive into your Wii, and launch the d2x cIOS Installer from the Homebrew Channel.
 </div>
 <div id="without-connection" class="blanktabcontent" markdown="1">
 
 ##### Section I - Downloading
 
-1. Download, extract, and open [NUS Downloader](https://github.com/WiiDatabase/nusdownloader/releases/download/v1.9-mod-nusfix/NUSD-Mod-NUS-Fix.zip).
-1. Select "Database", "IOS", and then "IOS56" and select the "Latest Version".
+1. Download, extract, and run [NUS Downloader](https://github.com/WiiDatabase/nusdownloader/releases/latest/download/NUSD-Mod-NUS-Fix.zip).
+1. Select "Database", "IOS", then "IOS57", and select "v5918".
    - Ensure that "Pack WAD" is checked and "Patch IOS" is unchecked.
-1. Repeat the previous step for "IOS57" and "IOS38".
-1. Once you have downloaded all three cIOSes, there will be a folder named `titles` in the same folder as the NUS Downloader. Open the folder and navigate through until you find the three WAD files you downloaded. Place each of them on the root of your SD card.
-1. Download d2x cIOS Installer and extract it to your SD card or USB drive.
-1. Insert your SD card or USB drive into your Wii, and launch d2x cIOS Installer from the Homebrew Channel.
+1. Repeat the previous step for IOS56 v5661 and IOS38 v4123.
+1. Once you have downloaded all three IOS, there will be a folder named `titles` in the same folder as the NUS Downloader. Open the folder and navigate through them until you locate the three WAD files you downloaded. Place each of WAD files on the root of your SD card or USB drive.
+1. Download the d2x cIOS Installer and extract it to the root of your SD card or USB drive.
+1. Insert your SD card or USB drive into your Wii, and launch the d2x cIOS Installer from the Homebrew Channel.
 </div>
 
 ##### Section II - Installing
 
 1. Press continue, then set the options to the following:
+
 ```
 Select cIOS: v10 beta52 d2x-v10-beta52
 Select cIOS base: 57
 Select cIOS slot: 249
 Select cIOS version: 65535
 ```
+
 ![Install cIOS 249](/images/cios/Install249.png)
+
 1. Once set, press A twice to install.
 1. When done installing, press A to return, and set the options to the following:
+
 ```
 Select cIOS: v10 beta52 d2x-v10-beta52
 Select cIOS base: 56
 Select cIOS slot: 250
 Select cIOS version: 65535
 ```
+
 ![Install cIOS 250](/images/cios/Install250.png)
+
 1. Once set, press A twice to install.
 1. When done installing, press A to return, and set the options to the following:
+
 ```
 Select cIOS: v10 beta52 d2x-v10-beta52
 Select cIOS base: 38
 Select cIOS slot: 251
 Select cIOS version: 65535
-``` 
+```
+
 ![Install cIOS 251](/images/cios/Install251.png)
+
 1. Once set, press A twice again to install, and then exit once done.
 
 #### Troubleshooting
 
 {% capture bruh %}
 Although the majority of games should work straight away with the defaults, some may require using a specific cIOS to function, or to utilize certain features within the game.<br>
 Examples include:
-* Using a keyboard in Animal Crossing: City Folk.
-* Running SpongeBob's Boating Bash.
+
+- Using a keyboard in Animal Crossing: City Folk.
+- Running SpongeBob's Boating Bash.
 
 A more comprehensive (although still incomplete) list can be found [**here**](https://wiki.gbatemp.net/wiki/Wii_cIOS_base_Compatibility_List)<br>
 To change the cIOS used for a specific game, follow these instructions:
 {% endcapture %}
+
 <div class="notice--warning">{{ bruh | markdownify }}</div>
 
 <button class="tablinks btn btn--large btn--primary" id="defaultOpen" onclick="openTab(event, 'usbloadergx')">USB Loader GX</button>

_pages/en_US/dump-games.md

@@ -5,23 +5,86 @@ title: "Dumping Wii/GameCube games"
 Want to dump a GameCube or a Wii disk? There are two ways of doing so, depending on the tools you have available with you.
 
 <button class="tablinks btn btn--large btn--primary" id="defaultOpen" onclick="openTab(event, 'cleanrip')">To the SD card/USB drive</button>
-<button class="tablinks btn btn--large btn--info" onclick="openTab(event, 'network')">To a PC over the network</button>
+<button class="tablinks btn btn--large btn--info" onclick="openTab(event, 'dump-smb')">To a PC over the network</button>
 
-{% capture cleanripInstructions %}
+<div id="cleanrip" class="blanktabcontent" markdown="1">
 
-### Cleanrip guide
+### CleanRip
 
-{% include_relative cleanrip.md %}
-{% endcapture %}
+#### What you need
 
-{% capture networkInstructions %}
+- An SD card or USB drive with at least 4.7 GB of free space (8.5 GB if dumping a dual layer disc).
+- [CleanRip](https://github.com/emukidid/cleanrip/releases/latest)
+
+#### Instructions
+
+##### Section I - Downloading/Installing
+
+1. Extract CleanRip and put it in the `apps` folder on your SD card or USB drive.
+1. Insert your SD card into your Wii, and launch CleanRip from the Homebrew Channel.
+
+##### Section II - Ripping
+
+1. Select your device that you will be dumping the game to - your USB drive or SD card.
+   ![Device type](/images/CleanRip/2.png)
+1. On this screen, it asks you if you want to download a file with game checksums so you can verify the dump created is a 1:1 copy of the disc. It's your choice whether to say `Yes` or `No` to download this file.
+   ![DAT](/images/CleanRip/3.png)
+1. Now insert the game you want to dump.
+   ![DVD](/images/CleanRip/4.png)
+   ![Initialising Disc](/images/CleanRip/5.png)
+1. Set it as shown on the screen below.
+
+If you are dumping one of the 13 games on [this list](https://wiki.dolphin-emu.org/index.php?title=Category:Dual_Layer_Disc_games), set `Dual Layer` to `Yes`.
+{: .notice--info}
+
+![Settings](/images/CleanRip/6.png)
+
+1. CleanRip will now dump your game. It can take a while, since it will dump the full 4.7 GB disc contents (8.5 GB for dual layer discs).
+![Copying](/images/CleanRip/7.png)
+</div>
+
+<div id="dump-smb" class="blanktabcontent" markdown="1">
 
 ### Dumping a game over a local network
 
-{% include_relative dump-smb.md %}
-{% endcapture %}
+#### What you need
+
+- [DVD Dump Tool](/assets/files/DVDDumpTool.zip)
 
-### Joining split files
+Your Wii and your computer must be connected to one local network.
+{: .notice--warning}
+
+#### Instructions
+
+##### Section I - Downloading/Installing
+
+1. Extract DVD Dump Tool and put it in the `apps` folder on your SD card or USB drive.
+1. Insert your SD card into your Wii, and launch DVD Dump Tool from the Homebrew Channel.
+
+##### Section II - Ripping
+
+1. Press the right on the D-pad and press A.
+   ![2](/images/DumpDiscs_LAN/2.png)
+1. Choose the disc that you want to copy (The options are: `GameCube Disc`, `Wii Single-Layer Disc`, `Wii Dual-Layer Disc` and press "A"
+   ![3](/images/DumpDiscs_LAN/3.png)
+1. Now put your game to your Wii. (If it's already in your Wii, eject it and put it back.)
+   ![InsertTheDisc](/images/DumpDiscs_LAN/insertthedisc.jpg)
+   ![4](/images/DumpDiscs_LAN/4.png)
+1. Remember your Wii URL (IP address)
+   ![5](/images/DumpDiscs_LAN/5.png)
+1. On your computer's web browser, go to your address bar and enter the Wii URL.
+   ![6](/images/DumpDiscs_LAN/6.png)
+1. Click on `Click here to download XXXX.iso`.
+   ![7](/images/DumpDiscs_LAN/7.jpg)
+
+   The transfer speed is not the fastest, but if you can't use anything else, it's better than nothing.
+   {: .notice--info}
+
+   ![8](/images/DumpDiscs_LAN/8.PNG)
+
+</div>
+
+## Joining split files
 
 If you dumped the disc on a FAT32 formatted, device, you should've got at least 2 files that end with `.partX.iso`. They need to be joined up.
 {: .notice--info}
@@ -40,8 +103,8 @@ If you dumped the disc on a FAT32 formatted, device, you should've got at least
 1.  Use the `cd <path>` command and replace `<path>` by the path to your `.partX.iso` files.
 1.  Use the following command as is: `cat \*.part?.iso > game.iso`.
 
-<div id="cleanrip" class="blanktabcontent">{{ cleanripInstructions | markdownify }}</div>
-<div id="network" class="blanktabcontent">{{ networkInstructions | markdownify }}</div>
+To organize the games on your drive properly, you'll need to use [Wii Backup Manager](wiibackupmanager).
+{: .notice--info}
 
 <script>
     let tabcontent = document.getElementsByClassName("blanktabcontent");