From 756b0feb4b72de721b692df5758862b38007b9c0 Mon Sep 17 00:00:00 2001
From: rxhfcy <42669366+rxhfcy@users.noreply.github.com>
Date: Tue, 19 Dec 2023 01:45:43 +0200
Subject: [PATCH 1/3] attempt to make "clean" in Makefile.docker actually clean
 skelatool64

After this change, `make -f Makefile.docker clean` no longer shows this error:

```
...
sudo @make -C skelatool64 clean
sudo: @make: command not found
make: *** [Makefile.docker:18: clean] Error 1
```

I did get lots of ugly new make spew though (the root cause should probably be fixed elsewhere later), but at least skelatool64 now cleaned properly, I think.
---
 Makefile.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.docker b/Makefile.docker
index e4ae803..95961ea 100644
--- a/Makefile.docker
+++ b/Makefile.docker
@@ -15,7 +15,7 @@ clean:
 	sudo rm -rf portal_pak_dir
 	sudo rm -rf portal_pak_modified
 	sudo rm -rf assets/locales
-	sudo @$(MAKE) -C skelatool64 clean
+	sudo $(MAKE) -C skelatool64 clean
 	
 english_audio:
 	docker run --rm -v $$PWD:/usr/src/app -e PORTAL64_WITH_DEBUGGER -e PORTAL64_WITH_GFX_VALIDATOR -it portal64 make english_audio

From 6e2fc9f9296ea19e1a38d424c776004abaa0ad77 Mon Sep 17 00:00:00 2001
From: Joseph <94092417+Jgoodwin64@users.noreply.github.com>
Date: Mon, 18 Dec 2023 21:17:43 -0500
Subject: [PATCH 2/3] Update README.md

Remove redundant skelatool64 in readme and added a version for ffmpeg.
---
 README.md | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 94ffb2e..5a48298 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,13 @@ Setup and install dependencies for `skelatool64`
 echo "deb [trusted=yes] https://lambertjamesd.github.io/apt/ ./" \
     | sudo tee /etc/apt/sources.list.d/lambertjamesd.list
 sudo apt update
-sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick unzip ffmpeg
+sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick unzip
+``
+```
+Install ffmpeg 4.3.1
+```
+sudo snap install ffmpeg  # version 4.3.1
+
 ```
 
 <br />
@@ -91,17 +97,6 @@ Install lua5.4 (You may need to remove other installed versions first, skelatool
 ```sh
 sudo apt install lua5.4 liblua5.4-dev liblua5.4-0
 ```
-
-<br />
-
-Setup and build skelatool64 (the version included in this portal64 repo!)
-
-```sh
-cd skelatool64
-./setup_dependencies.sh
-make
-```
-
 <br />
 
 You will need to install nodejs. You can use apt for this

From f8f81694e2b3379cd599e0b8189c1effeb562dcc Mon Sep 17 00:00:00 2001
From: Joseph <94092417+Jgoodwin64@users.noreply.github.com>
Date: Mon, 18 Dec 2023 21:32:13 -0500
Subject: [PATCH 3/3] Update README.md

FIxed WINE link in Readme.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5a48298..2c04816 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ make fix-nowine
 ```
 You can also try the old way of paddinng the ROM, but you don't need both.
 
-This method requires you to install wine to run properly. https://wiki.winehq.org/Ubuntu
+This method requires you to install wine to run properly. [WINE](https://wiki.winehq.org/Ubuntu)
 
 ```
 make fix