Update basic-setup.md and troubleshooting.md (#124)

Mention EA App, add section about using controller, link to other sections where necessary, and other general cleanup.

2 files changed, 32 insertions, 27 deletions

diff --git a/docs/installing-northstar/basic-setup.md b/docs/installing-northstar/basic-setup.md
index 5d8b6d6..91e268c 100644
--- a/docs/installing-northstar/basic-setup.md
+++ b/docs/installing-northstar/basic-setup.md
@@ -26,18 +26,14 @@ Should you notice any issues/warnings/errors while running Northstar, check the
 
 ## Additional Stuff
 
-Since Northstar doesn't launch directly through Origin or Steam, any startup arguments provided in either launcher won't transfer over. You'll need to add them to the file `ns_startup_args.txt`, which should be in the same folder as you extracted the Northstar files to.
+You can launch Northstar via Steam, Origin, or EA using [launch options](troubleshooting.md#launch-opts). 
 
 If Northstar doesn't appear to be installed, or you have issues entering the lobby, try running vanilla files. It's hard to say what VPK mods could cause issues with Northstar at the moment, so it'd probably be easiest just to try running unmodded.
 
-Northstar can be launched through Steam or Origin using the "add a game" feature. This allows you to register any .exe as a game. To set up Northstar, navigate to your Titanfall 2 folder and choose `NorthstarLaucher.exe`.
+Northstar can also be launched through Steam or Origin using the "add a game" feature. This allows you to register any .exe as a game. To set up Northstar, navigate to your Titanfall 2 folder and choose `NorthstarLaucher.exe`.
 
 ![steamaddgame](../images/steam-addgame.png) ![originaddgame](../images/origin-addgame.png)
 
-## Linux
+## Linux and Steam Deck
 
-Install instructions for [Linux can be found here](broken-reference).
-
-## SteamDeck
-
-Install instructions for [SteamDeck can be found here](broken-reference).
+Install instructions for [Linux and Steam Deck can be found here](steamdeck-and-linux/installing-on-steamdeck-and-linux.md)
diff --git a/docs/installing-northstar/troubleshooting.md b/docs/installing-northstar/troubleshooting.md
index 7835083..2f49b53 100644
--- a/docs/installing-northstar/troubleshooting.md
+++ b/docs/installing-northstar/troubleshooting.md
@@ -2,7 +2,7 @@
 
 Generally try to first launch the vanilla game (i.e. not Northstar) if you encounter any issue and see if it also occurs there as well. Some problems can occur when the vanilla game was never launched before using Northstar.
 
-A lot of problems around the game failing to communicate with Origin can also be prevented by launching Origin before Northstar should you encounter any issues in that regard.
+A lot of problems around the game failing to communicate with EA/Origin can also be prevented by launching EA/Origin before Northstar should you encounter any issues in that regard.
 
 Also note that some solutions described below can also apply to the base game, like issues caused by [10th+ gen Intel CPUs](troubleshooting.md#intel).
 
@@ -12,20 +12,16 @@ Also note that some solutions described below can also apply to the base game, l
 
 If the usual workaround of restarting Origin/rebooting or running the vanilla game first and then Northstar don’t work, try the following:
 
-* First and foremost, double check that you are _logged in_ on Origin. Titanfall will _not_ run if you are not connected to EA servers first (and neither will Titanfall + Northstar).
-* [Add the northstar commandline option in your launcher](troubleshooting.md#launch-opts)
-* Run the game with Origin/Steam instead of starting NorthstarLauncher.exe (important)
-* Sign out and exit Origin, then start Northstar. It will prompt you for a login, _hopefully_ fixing it if nothing else worked
+* First and foremost, double check that you are _logged in_ on EA/Origin. Titanfall will _not_ run if you are not connected to EA servers first (and neither will Titanfall + Northstar).
+* Run the game with EA/Origin/Steam by adding [launch options](troubleshooting.md#launch-opts) instead of starting NorthstarLauncher.exe (important)
+* Sign out and exit EA/Origin, then start Northstar. It will prompt you for a login, _hopefully_ fixing it if nothing else worked
 * Start normal Titanfall 2 and then Northstar (_ONLY WORKS SOMETIMES_)
 
 ## Tier0.dll Not found <a href="#tier0" id="tier0"></a>
 
 ![Failed to load the tier0.dll](../images/northstar-launcher-error-wrong-location.png)
 
-This error is usually caused by running the `NorthstarLauncher.exe` in the wrong location, such as extracting the zip it came with directly in your Downloads folder and running it there.
-
-* Default Steam Location: `%ProgramFiles(x86)%\Steam\steamapps\common\Titanfall2\`
-* Default Origin Location: `%ProgramFiles(x86)%\Origin Games\Titanfall2\`
+This error is usually caused by running the `NorthstarLauncher.exe` in the wrong location, such as extracting the zip it came with directly in your Downloads folder and running it there. The correct location is inside of the [titanfall2 directory](troubleshooting.md#game-location)
 
 **If it still appears after trying the fix above:** It's possible that you may have **corrupted or missing** game files
 
@@ -33,7 +29,7 @@ This error is usually caused by running the `NorthstarLauncher.exe` in the wrong
 
 ![bin folder](../images/bin-folder.png)
 
-* If you dont have them verify your game on steam/origin/ea
+* If you dont have them, [verify your game files](troubleshooting.md#verify-files)
 
 ## File Corruption Detected <a href="#file-corruption" id="file-corruption"></a>
 
@@ -62,7 +58,7 @@ Do NOT make any changes in `system32`, just copy the file.
 
 ### Solution 3
 
-1. Locate your `Titanfall2` folder
+1. Locate your [Titanfall2 folder](troubleshooting.md#game-location)
 2. Right click it and go `Properties > Security`
 3. Give yourself write permissions
 
@@ -87,7 +83,7 @@ See also [this thread on Steam](https://steamcommunity.com/app/1237970/discussio
 
 ## I disabled all mods and now I cannot re-enable them <a href="#disabled-mods" id="disabled-mods"></a>
 
-Go to your `Titanfall2` directory. From there go to the `R2Northstar` and delete `enabledmods.json`. This file stores information about which mods are enabled and disabled. By deleting this file Northstar will fall back to the default (all mods enabled) and re-create the file appropriately.
+Go to your [Titanfall2 directory.](troubleshooting.md#game-location) From there go to the `R2Northstar` folder and delete `enabledmods.json`. This file stores information about which mods are enabled and disabled. By deleting this file Northstar will fall back to the default (all mods enabled) and re-create the file appropriately.
 
 ## MSVCR120.dll / MSVCP120.dll Not found <a href="#msvcr" id="msvcr"></a>
 
@@ -105,24 +101,32 @@ Go to Mods at the bottom of your screen on the main menu, then click Authenticat
 
 ## I can't open the console <a href="#console" id="console"></a>
 
-* Navigate to your Titanfall2 directory then open
+* Navigate to your [Titanfall2 directory](troubleshooting.md#game-location)
 * Open `R2Northstar\mods\Northstar.Client\mod\cfg\autoexec_ns_client.cfg`
   * And change the \` to one of the F keys (for example `F1` / `F2`) (Note: _Only \~ or F1-12 work_) - This _should_ fix it
     * _Restart game!_
 
 ## The Main Menu is blank <a href="#blank-menu" id="blank-menu"></a>
 
-* Please remove conflicting mods such as `better.serverbrowser` and reinstall _Northstar core mods_ (those that start with `Northstar.` / are in the [NorthstarMods repository](https://github.com/R2Northstar/NorthstarMods) / included in the release zip).\\
+* Please remove conflicting mods such as `better.serverbrowser` and reinstall _Northstar core mods_ (those that start with `Northstar.` / are in the [NorthstarMods repository](https://github.com/R2Northstar/NorthstarMods) / included in the release zip).
 * Try deleting `enabledmods.json` inside the R2Northstar folder as well.
 * Otherwise pay attention in console for your errors if you know what you're doing.
 
+## Default Game Locations <a href="#game-location" id="game-location"></a>
+
+* Default Steam Location: `%ProgramFiles(x86)%\Steam\steamapps\common\Titanfall2\`
+* Default EA Location: `%ProgramFiles%\EA Games\Titanfall2`
+* Default Origin Location: `%ProgramFiles(x86)%\Origin Games\Titanfall2\`
+
 ## Adding Launch Options <a href="#launch-opts" id="launch-opts"></a>
 
-Adding `-northstar` will start Northstar when launching from your launcher\
-Adding `-vanilla` will start the normal game when you have Northstar installed
+Adding `-northstar` will start Northstar when launching from your library\
+Adding `-vanilla` or removing the `-northstar` will start the normal game when you have Northstar installed
 
 * For Steam
-  * `Your library > Right click TF|2 > Properties > Launch Options > -northstar or -vanilla`
+  * `Your library > Right click TF|2 > Properties > General > Launch Options > -northstar or -vanilla`
+* For EA app
+  * `My collection > Click the three dots on TF|2 > Properties > Advanced launch options > -northstar or -vanilla`
 * For Origin
   * `Your library > Right click TF|2 > Game Properties > Advanced Launch Options > Command Line Arguments > -northstar or -vanilla`
 
@@ -135,7 +139,12 @@ This is a small guide to help you understand how to verify the files of your gam
 * For EA app
   * `My collection > Click the three dots on TF|2 > Repair`
 * For Origin
-  * `My Game Library > Click on TF|2 > Click the gear icon > Repair`
+  * `Your library > Click on TF|2 > Click the gear icon > Repair`
+
+## Controller Not Working <a href="#controller" id="controller"></a>
+
+If you're having issues with your controller working on Northstar, you can add Northstar to Steam to make it use Steam's controller settings.\ 
+To do this, go to Steam, then in the bottom left corner, hit `ADD A GAME` > `Add a Non-Steam Game...` > `BROWSE...` > Find `NorthstarLauncher` in your [titanfall2 directory](troubleshooting.md#game-location)
 
 ## Access Violation
 
@@ -173,7 +182,7 @@ This issue could also be caused if you use some sort of audio wrapper to control
 
 ## Windows 11 AutoHDR disabled while using Northstar
 
-You need to launch Northstar via Titanfall2 with `-northstar` passed as argument. To do this, go go to Steam/Origin (depending on where you bought the game), navigate to the settings where you can set launch arguments for Titanfall2. Add `-northstar` so that it launches Northstar instead. Launch the game via Steam/Origin.
+You need to launch Northstar via Titanfall 2 by setting up [launch options](troubleshooting.md#launch-opts) and launching the game from your library.
 
 Relevant issue on GitHub: [https://github.com/R2Northstar/Northstar/issues/284](https://github.com/R2Northstar/Northstar/issues/284)