diff --git a/_pages/en_US/riiconnect24.md b/_pages/en_US/riiconnect24.md
index 809a1d48af92..4cfa978b2965 100644
--- a/_pages/en_US/riiconnect24.md
+++ b/_pages/en_US/riiconnect24.md
@@ -69,15 +69,18 @@ If you can't run RiiConnect24 Patcher, please join [the RiiConnect24 Discord ser
##### Section II - Installing WADs
+If you have previously installed the WiiLink versions of the WiiConnect24 Channels, installing RiiConnect24's versions will overwrite them. If they have not been overwritten, try uninstalling the WiiLink versions, and reinstalling them with the RiiConnect24 versions.
+{: .notice--warning}
+
You will now install the patched IOS and Channel WADs that are required to use RiiConnect24.
1. Extract the YAWM ModMii Edition `.zip` file, and copy the `apps` folder to your SD card or USB drive.
-1. Put your SD card or USB drive in your Wii.
-1. Launch the Homebrew Channel on your Wii.
-1. Launch YAWM ModMii Edition.
-1. Select the device you have put the RiiConnect24 files on.
-1. Highlight all the WADs in the `wad` folder by pressing the + Button to select them. When all of the WADs are selected, press A twice to install the WADs.
-1. After they are successfully installed, press the HOME Button to exit back to the Homebrew Channel.
+2. Put your SD card or USB drive in your Wii.
+3. Launch the Homebrew Channel on your Wii.
+4. Launch YAWM ModMii Edition.
+5. Select the device you have put the RiiConnect24 files on.
+6. Highlight all the WADs in the `wad` folder by pressing the + Button to select them. When all of the WADs are selected, press A twice to install the WADs.
+7. After they are successfully installed, press the HOME Button to exit back to the Homebrew Channel.
##### Section III - Patching nwc24msg.cfg
@@ -135,10 +138,6 @@ If you get error 107304 or you see Nintendo's User Agreement without RiiConnect2
If you're getting errors such as `WiiConnect24 and Wii Shop Channel currently not being offered in your country`, go to Wii Settings -> Last Page -> Country and change it to United Kingdom. You will get this error when using a country that we don't support. Contact us at [support@riiconnect24.net](mailto:support@riiconnect24.net) if you need more help.
{: .notice--warning}
-[Continue to WiiLink](wiilink)
-WiiLink lets you use the Japanese-exclusive channels known as Wii no Ma and Digicam Print Channel. This is optional to install.
-{: .notice--info}
-
[Continue to Wiimmfi](wiimmfi)
Wiimmfi lets you play games online after the discontinuation of Nintendo Wi-Fi Connection. This is optional to install.
{: .notice--info}
diff --git a/_pages/en_US/wiilink-demae-dominos.md b/_pages/en_US/wiilink-demae-dominos.md
index 9ab5446531dd..85c7046fea32 100644
--- a/_pages/en_US/wiilink-demae-dominos.md
+++ b/_pages/en_US/wiilink-demae-dominos.md
@@ -4,7 +4,7 @@ title: WiiLink Food Delivery Channel (Domino's) Guide
{% include toc title="Table of Contents" %}
-If you need help for anything regarding this tutorial, please join [the WiiLink Discord server](https://discord.gg/wiilink-750581992223146074).
+For support with WiiLink, please visit the [WiiLink Discord Server](https://discord.com/invite/reqUMqxu8D) or e-mail us at [support@wiilink24.com](mailto:support@wiilink24.com).
{: .notice--info}
You no longer need to pay $1 to get and use Food Delivery Channel (Domino's). It's now completely _free_!
@@ -19,50 +19,49 @@ Currently, only the USA and Canada are supported.
You cannot use the default Dolphin NAND with this service. You must use your own NAND dump. This can be done in Dolphin by going to the toolbar and clicking `Tools -> Manage NAND -> Import BootMii NAND Backup`.
{: .notice--warning}
+Deliveroo has been discontinued as of September 19, 2023! Please do not select this option in the installer.
+{: .notice--danger}
+
#### What you need
- An SD card or USB drive
-- A Wii console with an active internet connection
-- A computer with an active internet connection
+- A Wii with an active Internet Connection
+- A Windows, macOS, or Linux Computer with an active Internet Connection
- A Discord account
+- The latest version of [WiiLink Patcher](https://github.com/WiiLink24/WiiLink24-Patcher/releases/latest)
+- [YAWM ModMii Edition](https://oscwii.org/library/app/yawmme)
#### Instructions
##### Section I - Getting Started
-1. Download the latest version of the WiiLink Patcher, available [here](https://github.com/WiiLink24/WiiLink24-Patcher/tree/csharp-ver).
-2. Make sure to download the version in the README that corresponds to your operating system.
-3. Launch the patcher and begin the setup process.
-4. When you see the setup screen, select `1. English Translation` in order to gain access to the Food Delivery Channel (Domino's) channel.
- 
-5. Next, you’ll see this screen, asking which version of Food Delivery Channel you want, so you’ll want to pick `2. Domino's (US and Canada only)`
- 
-6. After that, you can go through the rest of the process, but once you reach this step, be sure to pick the correct console platform you’re installing this on, as it will matter when using the app.
- 
+1. Download the latest version of WiiLink Patcher (listed above) for your Operating System, as listed in the README.
+2. Launch the patcher and begin the setup process. When you see the setup screen, select `1. English Translation` in order to gain access to the Food Delivery Channel (Domino's) channel.
+ 
+3. Next, you will see this screen, asking which version of Food Delivery Channel you want, so you will want to pick `2. Domino's (US and Canada only)`.
+ 
+4. After that, you can go through the rest of the process, but once you reach Step 6 (this step), be sure to pick the correct console platform you’re installing this on, as it will matter when using the app.
+ 
##### Section II - Registering your Console ID
-1. After completing the setup process, go to the [**WiiLink Discord server**](https://discord.gg/wiilink-750581992223146074) to register your Wii's console ID.
-2. Use the `Get Console ID` Homebrew app, that was given by the patcher, to retrieve your system's console ID.
+1. After completing the setup process, go to the [WiiLink Discord server](https://discord.com/invite/reqUMqxu8D) to register your Wii's console ID.
+2. Use the `Get Console ID` Homebrew app that was downloaded by the patcher to retrieve your system's console ID.
3. Visit the `#dominos-chat` channel on the Discord server.
4. Type the command `/dominos ` in the chat, replacing `` with your actual console ID. Make sure the ID is in the parameter box, otherwise the command will not work and will be posted publicly on the channel.
5. Double-check that you've typed the correct console ID, as it can't be re-registered. If you need to re-register, ask a staff member in the server for assistance.
##### Section III - Installing WADs
-You will now install the Food Delivery Channel and Set Personal Data channels.
-
-1. Put your SD card or USB drive in your Wii.
-2. After registering your console ID, go to the Homebrew Channel and launch YAWM ModMii Edition.
-3. In the WAD Manager menu, locate `Food Channel (Domino's) (English).wad`.
-4. Also locate `WiiLink_SPD (Wii).wad` or `WiiLink_SPD (vWii).wad`, depending on your console platform.
-5. Select both WADs by pressing `+` on each one.
-6. Press `A` to install the selected WADs.
+[If you would like to see detailed instructions on how to install WAD files, click here.](yawmme)
+{: .notice--info}
If you happen to get `Error -1022` when installing `Food Channel (Domino's) (English).wad`, uninstall the channel by selecting the WAD with `-` and pressing `A`. Then, re-install the WAD.
{: .notice--warning}
-##### Section IV - Setting your address information
+Installing WADs are covered in the main WiiLink guide [here](wiilink#section-ii---installing-wads).
+
+##### Section IV - Adding your address information to the Address Information Settings (SPD)
WiiLink never stores your personal data. For more information on what is used, read our [Privacy Policy](https://www.wiilink24.com/privacy-policy).
{: .notice--info}
@@ -74,31 +73,31 @@ In this section you will be setting your address information. This is required f
1. Launch the Food Delivery Channel from the Wii Menu.
2. If you have not previously set your address information, a prompt telling you to set it will appear. Press the `Address Info` button. Otherwise, click the `Change Address Information` button in the main menu.
-3. Now you are in the Address Information menu. Press the arrows to traverse screens. Here you will enter your data. When you are finished, click the `Done` button and then `Demae`.
- 
+3. Now you are in the Address Information menu. Press the arrows to change screens. Here you will enter your data. When you are finished, click the `Done` button and then `Demae`.
+ 
##### Section V - Placing an order
+If you have previously placed an order, skip to step 4.
+{: .notice--info}
+
This section requires you to have cash to pay for your meal.
{: .notice--warning}
-If you have used the standard version of the Food Delivery Channel before, go to the
`Wii Menu settings` -> `Data Management` -> `Save Data` -> `Wii`, then find the
Food Delivery Channel icon and click "Erase" to delete the existing save data.
+If you have used the standard version of the Food Delivery Channel before, go to
`Wii Menu settings` -> `Data Management` -> `Save Data` -> `Wii`, then find the
Food Delivery Channel icon and click "Erase" to delete the existing save data.
{: .notice--warning}
-If you have previously placed an order, skip to step 4.
-{: .notice--info}
-
1. Launch the Food Delivery Channel (aka. Food Channel) from the Wii Menu
-2. Follow the on-screen instructions, then click `Order` in the main menu.
- 
-3. You will now be prompted to select your region. Be sure to select your residing country correctly. Failure to do so will result in restaurants failing to load. You will then be prompted to select your state/province, then city. If your city is not on the list, you can select any one as it does not matter.
- 
+2. Follow the on-screen instructions, then click `Order` in the main menu.
+ 
+3. You will now be prompted to select your region. Be sure to select your residing country correctly. Failure to do so will result in restaurants failing to load. You will then be prompted to select your state/province, then city. If your city is not on the list, you can select any one as it does not matter.
+ 
4. Click the `Pizza` button. This will load all the restaurants in your area. The first restaurant in the list is the one closest to you.
5. Click `See Menu` to list the different menu categories. Click the category you would like, then select a food item. In the item screen, you can add toppings and adjust quantity.
6. After adding a food item, you will be brought to the basket. To add a food item, scroll to the bottom and select `Add Order`. To proceed to checkout, click `Next`.
-7. Review your order thoroughly before placing the order. When you are ready, click the big green `Order` button.
- 
+7. Review your order thoroughly before placing the order. When you are ready, click the big green `Order` button.
+ 
8. If no error appeared, your order was placed successfully! To track your order, simply visit the Domino's Tracker for your region and enter the phone number you entered in the Address Information menu.
**_Happy ordering!_**
diff --git a/_pages/en_US/wiilink.md b/_pages/en_US/wiilink.md
index 70ec575decc4..90eb94a7dca2 100644
--- a/_pages/en_US/wiilink.md
+++ b/_pages/en_US/wiilink.md
@@ -4,69 +4,113 @@ title: "WiiLink"
{% include toc title="Table of Contents" %}
-If you need help with anything regarding this tutorial, please join [the WiiLink Discord server](https://discord.gg/wiilink-750581992223146074).
+For support with WiiLink, please visit the [WiiLink Discord Server](https://discord.com/invite/reqUMqxu8D) or e-mail us at [support@wiilink24.com](mailto:support@wiilink24.com).
{: .notice--info}
-[WiiLink](https://wiilink24.com/) lets you use the Japanese-exclusive channels known as Wii Room, the Digicam Print Channel, and the Food Channel again.
-Additionally, WiiLink lets you use other WiiConnect24 channels such as the Nintendo Channel, Forecast Channel, and Everybody Votes Channel.
+This guide includes instructions on installing WiiLink on both a physical Wii and Dolphin Emulator. If you would only like to install Dolphin, please check the first part of the guide.
+{: .notice--info}
-The Kirby TV Channel is back!
-If you installed it previously, please follow the instructions to update it.
-{: .notice--success}
+
+
+[WiiLink](https://wiilink24.com/) allows you use Wii Channels originally exclusive to Japan, such as:
+
+- Wii Room
+- Photo Prints Channel
+- Food Channel
+
+WiiLink also provides revived and enhanced WiiConnect24 Channels such as:
+
+- Forecast Channel
+- Everybody Votes Channel
+- Nintendo Channel
+
+
+In Dolphin version 5.0-19724 and later, Wiiconnect24 support has been added through WiiLink services!
+
+All you need to do is go to `Config -> Wii` and `Enable WiiConnect24 via WiiLink`.
+
+
#### What you need
-- An SD card or USB drive
-- A Wii with an Internet connection
-- A Windows, macOS, or Linux computer
+- An SD Card or USB Drive
+- A Wii with an active Internet Connection
+- A Windows, macOS, or Linux Computer with an active Internet Connection
+- The latest version of [WiiLink Patcher](https://github.com/WiiLink24/WiiLink24-Patcher/releases/latest)
#### Instructions
-##### Section I - Patching WADs
+##### For vWii Users ONLY
-[If you want to see detailed instructions on how to install the WADs, click here!](yawmme)
+If you are on vWii and are downloading the Forecast Channel, you must tweak the system via Priiloader for the app to function properly. Instructions on how to do this may be found [here](riiconnect24-vwii#section-iv---using-riiconnect24).
+{: .notice--warning}
+
+##### Section I - Using WiiLink Patcher
+
+On Windows, you may encounter a SmartScreen warning that running the Patcher may put your PC at risk. This is a false positive; you can run the Patcher anyways by pressing "More info" and then "Run anyway".
{: .notice--info}
-1. Visit the [WiiLink Patcher releases page](https://github.com/WiiLink24/WiiLink24-Patcher/releases) and download the correct patcher for your operating system.
-1. On Windows, run `WiiLink_Patcher_Windows_v1.X.X.exe`.
-On MacOS, right click the `WiiLink_Patcher_macOS_v1.X.X` file in Finder and click Open.
-On Linux, open a Terminal, type `bash ` (space included), then drag the file onto the Terminal window. It should look like this: `bash /path/to/WiiLink_Patcher_Linux-_v1.X.X`
-1. Press `1` to choose "`Start Express Install Setup`".
-1. Follow the on screen instructions to select which versions of the available channels you would like.
-1. At step 6, press `1` to begin patching.
-1. It may take a moment for the patcher to download the files to your SD Card or USB Drive.
-1. Once it's done, you can safely close the patcher. All of the files are ready on your SD Card.
-1. If it did not copy everything automatically to your SD Card or USB Device, copy the `WAD` and `apps` folder next to
`WiiLink_Patcher__v1.X.X` to the root of your SD Card or USB Device.
-1. Put your SD card or USB drive in your Wii.
-1. Launch the Homebrew Channel on your Wii.
-1. Launch YAWM ModMii Edition.
-1. Select your SD card or USB drive accordingly.
-1. If your Wii is not a Japanese region, install `WiiLink_SPD (Wii).wad` or `WiiLink_SPD (vWii).wad` (Depending on console platform) before anything else. This is required so that we know your email address to send files.
-1. Highlight all other WADs with `WiiLink` in the name and press + to select them. When all of them are selected, press A twice to install the WADs.
- - If you have previously installed the RiiConnect24 versions of the Forecast Channel and the Nintendo Channel, installing WiiLink's will overwrite them.
-
-1. After they are successfully installed, press the HOME Button to exit back to the Homebrew Channel.
-
-Want to order Domino's Pizza with WiiLink's Food Delivery Channel?
[Follow this guide!](wiilink-demae-dominos)
+If you select "Japanese" on the third step, you will not download the Food Channel (Demae Domino's). You would be required to run the Patcher a second time and select the English Translation option to do this.
+{: .notice--warning}
+
+1. Download the latest version of WiiLink Patcher (listed above) for your Operating System, as listed in the README.
+ 
+2. Launch the Patcher according to your operating system:
+ - Windows: Run `WiiLink_Patcher_Windows_v1.X.X.exe`.
+ - MacOS: Right click the `WiiLink_Patcher_macOS_v1.X.X` file in Finder and click Open.
+ - Linux: Open a terminal, type `bash ` (space included), then drag the file onto the Terminal window. It should look like this:
`bash /path/to/WiiLink_Patcher_Linux-_v1.X.X` (NOTE: \ will be either x64 or arm64 based on your architecture).
+3. Begin the download process by selecting
`1. Start Express Install Setup (Reccomended)`.
+ 
+3. You will be asked to choose a language for the Japan exclusive apps, either select the `1. English Translation` or the original `2. Japanese` format.
+ 
+4. If you selected the English translation, will be asked on what verison of the Food Channel (Demae Domino's) you would like to install. If you don't want any actual ordering functionality, simply select
+`1. Standard (Fake Ordering)` for fake ordering. Otherwise, follow [this](wiilink-demae-dominos) guide on instructions for real ordering.
+ 
+5. Next, you will be asked whether or not you would like to install WiiLink's WiiConnect24 services. If you choose not to do this, please skip to step 7.
+ 
+6. If you selected yes on the previous step, you will be asked which region you would like to install for each respective WiiConnect24 channel.
+ 
+7. Select whether or not you would like to install the Kirby TV channel.
+ 
+8. Select which console type you will be installing WiiLink to.
+ 
+9. At this step, the Patcher will download the needed files based on your selections to the specified path.
+ 
+
+If you did not let the Patcher copy everything automatically to your SD Card or USB Drive: Copy the `WAD` and `apps` folder in the current directory the Patcher is in to the root of your SD Card or USB Drive.
{: .notice--info}
-##### Section II - Adding your email to Address Information (Set Personal Data)
+##### Section II - Installing WADs
-Adding your email to the Address Information (SPD) settings menu will allow the Digicam Print Channel to send images to your email that you created using it.
+[If you would like to see detailed instructions on how to install WAD files, click here.](yawmme)
{: .notice--info}
-1. Launch Digicam Print Channel from your Wii's home menu.
-2. On the bottom right, press `Address settings` and then `Yes`.
-3. Click on `Email Address` within the Address Information menu and type in your email address. (make sure you **put it in correctly** or it **will not work!**)
-4. Press `OK` and then `Done`.
-5. Once you are back in the Address Information menu, choose `Digicam` in the `Choose Channel` menu. After you’ve done that, it should work!
+If you have previously installed the RiiConnect24 versions of the WiiConnect24 Channels, installing WiiLink's versions will overwrite them. If they have not been overwritten, try uninstalling the RiiConnect24 versions, and reinstalling them with the WiiLink versions.
+{: .notice--warning}
+
+1. Start up the Homebrew Channel and enter yawmME (YAWM ModMii Edition). Then, select your SD Card or USB Drive accordingly.
+2. If you are installing the Food Channel or Photo Prints Channel, you may also have files called `WiiLink SPD`. These files will have either have `(Wii)` or `(vWii)` appended to the end depending on which console youre installing it on. If your Wii is not a Japanese region, install the correct version depending on your console before anything else. This is required so that we know your email address to send files.
+3. Highlight all of the WADs with `WiiLink` in the name and press + to select them. When all of them are selected, press A twice to install the WADs.
+4. After it is successfully installed, press the HOME Button to exit back to the Homebrew Channel. Press the HOME Button again and select `"Exit to System Menu"`.
+
+##### Section III - Adding your email to the Address Information Settings (SPD) (ONLY if you completed Section II.2)
-For PAL (European Wiis)
-In Wii Settings please set TV Resolution to 60 HZ (480p/480i). You can find this in `Screen -> TV Resolution` If you do not, a pink bar will appear at the bottom of the screen obscuring vision.
+WiiLink never stores your personal data. For more information on what is used, read our [Privacy Policy](https://www.wiilink24.com/privacy-policy).
{: .notice--info}
-[Continue to RiiConnect24](riiconnect24)
-RiiConnect24 allows you to use discontinued services from WiiConnect24, which include the News, Forecast, Everybody Votes, Nintendo and Check Mii Out Channel, along with Wii Mail. This is optional to install.
+If you have installed the Photo Prints Channel, you will need to complete this section for the apps to function properly. If you have installed the Food Channel, please refer [here](wiilink-demae-dominos#section-iv---adding-your-address-information-to-the-address-information-settings-spd) for unique SPD instructions.
+{: .notice--warning}
+
+1. Launch Photo Prints Channel from your Wii’s home menu.
+2. On the bottom right, press `Address Settings` and then `Yes`.
+3. Click on `Email Address` within the settings and type in your email address. (make sure you put it in correctly or it will not work!) Press `OK` and then `Done`.
+4. Once you are in the SPD main menu, choose `Digicam` in the Choose Channel menu. After you’ve done that, it should work!
+
+Congratulations! You've installed WiiLink24 onto your console! Enjoy what WiiLink has to offer to your hearts content.
+{: .notice--success}
+
+For PAL (European) Wii's
+In Wii Settings, please set your TV Resolution to 60 HZ (480p/480i). You can find this in `Screen -> TV Resolution`. Otherwise, a pink bar will display at the bottom of the screen, obscuring vision.
{: .notice--info}
[Continue to Wiimmfi](wiimmfi)
diff --git a/images/Dolphin_WiiLink/enable-wiilink.png b/images/Dolphin_WiiLink/enable-wiilink.png
new file mode 100644
index 000000000000..e18b810ff1a3
Binary files /dev/null and b/images/Dolphin_WiiLink/enable-wiilink.png differ
diff --git a/images/WiiLinkLogo.png b/images/WiiLinkLogo.png
new file mode 100644
index 000000000000..447b7e5cdfec
Binary files /dev/null and b/images/WiiLinkLogo.png differ
diff --git a/images/WiiLink_Patcher/1.png b/images/WiiLink_Patcher/1.png
new file mode 100644
index 000000000000..d2901a5efca8
Binary files /dev/null and b/images/WiiLink_Patcher/1.png differ
diff --git a/images/WiiLink_Patcher/2.png b/images/WiiLink_Patcher/2.png
new file mode 100644
index 000000000000..fe85c324d54d
Binary files /dev/null and b/images/WiiLink_Patcher/2.png differ
diff --git a/images/WiiLink_Patcher/3.png b/images/WiiLink_Patcher/3.png
new file mode 100644
index 000000000000..bcd2e86666b8
Binary files /dev/null and b/images/WiiLink_Patcher/3.png differ
diff --git a/images/WiiLink_Patcher/4.png b/images/WiiLink_Patcher/4.png
new file mode 100644
index 000000000000..672483a3ed54
Binary files /dev/null and b/images/WiiLink_Patcher/4.png differ
diff --git a/images/WiiLink_Patcher/5.png b/images/WiiLink_Patcher/5.png
new file mode 100644
index 000000000000..be7f42f4962c
Binary files /dev/null and b/images/WiiLink_Patcher/5.png differ
diff --git a/images/WiiLink_Patcher/6.png b/images/WiiLink_Patcher/6.png
new file mode 100644
index 000000000000..2ed03e3680cb
Binary files /dev/null and b/images/WiiLink_Patcher/6.png differ
diff --git a/images/WiiLink_Patcher/7.png b/images/WiiLink_Patcher/7.png
new file mode 100644
index 000000000000..7408e9b93254
Binary files /dev/null and b/images/WiiLink_Patcher/7.png differ
diff --git a/images/WiiLink_Patcher/8.png b/images/WiiLink_Patcher/8.png
new file mode 100644
index 000000000000..e8d23400af69
Binary files /dev/null and b/images/WiiLink_Patcher/8.png differ
diff --git a/images/WiiLink_Patcher/9.png b/images/WiiLink_Patcher/9.png
new file mode 100644
index 000000000000..dd82149c8780
Binary files /dev/null and b/images/WiiLink_Patcher/9.png differ