From b6c82f425251258a9abc062425eacf34b6129fd5 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:47:28 +1000
Subject: [PATCH 01/19] Build DEV and master branch
---
.github/workflows/action.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 69da667..e53d089 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -2,7 +2,7 @@ name: 'Build'
on:
push:
- branches: [ master ]
+ branches: [ master, dev ]
schedule:
- cron: "0 0 * * *"
From ab4300aab04e06dab3330b5ff6fba9ad78a8f842 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 11:07:53 +1000
Subject: [PATCH 02/19] Forked recalbox theme to have Switch and Vita art
---
download_list.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/download_list.json b/download_list.json
index 911bccf..bf1d013 100644
--- a/download_list.json
+++ b/download_list.json
@@ -135,8 +135,8 @@
"repo": "Francommit/emulationstation"
},
{
- "file": "recalbox-backport-v2.1.zip",
- "repo": "fonic/recalbox-backport"
+ "file": "recalbox-backport-v2.2.zip",
+ "repo": "Francommit/recalbox-backport"
},
{
"file": "ccleste.3dsx",
From 9c3a7cf812bcabb027f243c926cd29e7e156d8ff Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 11:17:09 +1000
Subject: [PATCH 03/19] Bump retroarch minor version to 1.9.6
---
download_list.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/download_list.json b/download_list.json
index bf1d013..342cbcf 100644
--- a/download_list.json
+++ b/download_list.json
@@ -22,7 +22,7 @@
},
{
"file": "RetroArch.7z",
- "url": "https://buildbot.libretro.com/stable/1.9.0/windows/x86_64/RetroArch.7z"
+ "url": "https://buildbot.libretro.com/stable/1.9.6/windows/x86_64/RetroArch.7z"
},
{
"file": "assimilate_full.zip",
From 1051ad0f3f379da928b1d209cc9a634e88420e30 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 11:19:46 +1000
Subject: [PATCH 04/19] Bumped recalbox zip
---
prepare.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/prepare.ps1 b/prepare.ps1
index f4dcde4..451af7b 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -818,7 +818,7 @@ Set-Content $esConfigFile -Value $newConfig
Write-Host "INFO: Setting up Emulation Station theme recalbox-backport"
$themesPath = "$env:userprofile\.emulationstation\themes\recalbox-backport\"
-$themesFile = "$requirementsFolder\recalbox-backport-v2.1.zip"
+$themesFile = "$requirementsFolder\recalbox-backport-v2.2.zip"
if(Test-Path $themesFile){
Expand-Archive -Path $themesFile -Destination $requirementsFolder | Out-Null
$themesFolder = "$requirementsFolder\recalbox-backport\"
From 0643bd400a940177cb67f48d07c9ae528efab096 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 11:29:27 +1000
Subject: [PATCH 05/19] Update README.md
---
README.md | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 83eb4cc..5a2b712 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,24 @@
-EmulationStation configured for Windows 10
+EmulationStation configured for Windows
======
-An auto-installer to set up Emulation Station correctly on a 64-bit version of Windows 10.
+An auto-installer to set up Emulation Station correctly on a 64-bit version of Windows 10/11
+
+TO-DO
+-----
+- Test setup on Windows 11
+- Fix scraper with . in path name
+- Add Switch homebrew game
+- Add Vita Switch game
+- Re-do GIF with Switch emulator in it
+- Add Xbox Emulator
+- Add Xbox art
+- Add Xbox 360 emulator
+- Add Xbox 360 art
+
Features
------
From 7d7148d891fb9c10e29330174c719f0159c57f9c Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 11:43:48 +1000
Subject: [PATCH 06/19] Deal with new parent folder in Retroarch 7z
---
prepare.ps1 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/prepare.ps1 b/prepare.ps1
index 451af7b..8f1f1eb 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -122,7 +122,11 @@ $coresPath = "$retroArchPath\cores"
$retroArchBinary = "$requirementsFolder\RetroArch.7z"
if(Test-Path $retroArchBinary){
New-Item -ItemType Directory -Force -Path $retroArchPath | Out-Null
- Expand-Archive -Path $retroArchBinary -Destination $retroArchPath | Out-Null
+ Expand-Archive -Path $retroArchBinary | Out-Null
+ # TO-DO - add an Out-Null when this has been tested
+ Copy-Item -Path RetroArch-Win64\* -Destination $retroArchPath -recurse -Force
+ # New path - $retroArchPath\RetroArch-Win64
+
} else {
Write-Host "ERROR: $retroArchBinary not found."
exit -1
From 84870403ea556b033ad330011a971eed5b51df1f Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 11:53:54 +1000
Subject: [PATCH 07/19] Update prepare.ps1
---
prepare.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/prepare.ps1 b/prepare.ps1
index 8f1f1eb..b4c66e1 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -122,7 +122,7 @@ $coresPath = "$retroArchPath\cores"
$retroArchBinary = "$requirementsFolder\RetroArch.7z"
if(Test-Path $retroArchBinary){
New-Item -ItemType Directory -Force -Path $retroArchPath | Out-Null
- Expand-Archive -Path $retroArchBinary | Out-Null
+ Expand-Archive -Path $retroArchBinary -Destination . | Out-Null
# TO-DO - add an Out-Null when this has been tested
Copy-Item -Path RetroArch-Win64\* -Destination $retroArchPath -recurse -Force
# New path - $retroArchPath\RetroArch-Win64
From 336bff4a25238da255c4aed0eb2805c158986b53 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 15:19:07 +1000
Subject: [PATCH 08/19] Add Xbox emulator
---
download_list.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/download_list.json b/download_list.json
index 342cbcf..73b04d9 100644
--- a/download_list.json
+++ b/download_list.json
@@ -149,6 +149,10 @@
{
"file": "windows-latest.zip",
"repo": "Vita3K/Vita3K"
+ },
+ {
+ "file": "xemu-win-release.zip",
+ "repo": "mborgerson/xemu"
}
],
"other_downloads": [
From e2a776c79a999cf57112b113dfaa4a38f4ce8397 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 15:39:42 +1000
Subject: [PATCH 09/19] Add xbox emu
---
prepare.ps1 | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/prepare.ps1 b/prepare.ps1
index b4c66e1..1352eb8 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -346,6 +346,22 @@ else {
exit -1
}
+Write-Host "INFO: Setup Xbox"
+$xboxEmuZip = "$requirementsFolder\xemu-win-release.zip"
+if (Test-Path $xboxEmuZip) {
+ $xboxEmuPath = "$env:userprofile\.emulationstation\systems\xbox\"
+ New-Item -ItemType Directory -Force -Path $xboxEmuPath | Out-Null
+ Expand-Archive -Path $xboxEmuZip -Destination $xboxEmuPath | Out-Null
+}
+else {
+ Write-Host "ERROR: $xboxEmuZip not found."
+ exit -1
+}
+
+# TO-DO: Deal with roms
+$xboxRomPath = "$romPath\xbox"
+
+
Write-Host "INFO: Setup PS Vita"
$vitaPath = "$romPath\vita"
$vitaRom = "$requirementsFolder\C4.vpk"
From c0ce005cfce1f6c0c1cf12752daf65c032db7ba2 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Sat, 10 Jul 2021 21:29:04 +1000
Subject: [PATCH 10/19] Update README.md
---
README.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/README.md b/README.md
index 5a2b712..0a78ac5 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,6 @@ TO-DO
-----
- Test setup on Windows 11
- Fix scraper with . in path name
-- Add Switch homebrew game
-- Add Vita Switch game
- Re-do GIF with Switch emulator in it
- Add Xbox Emulator
- Add Xbox art
From 6f165cc77d0f28c99a148f00e81e1c5ca09b2f80 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Mon, 9 Aug 2021 19:56:33 +1000
Subject: [PATCH 11/19] Finished TO-DO
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index a286377..1a3ea8c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ An auto-installer to set up Emulation Station correctly on a 64-bit version of W
TO-DO
-----
-- Test setup on Windows 11
- Fix scraper with . in path name
- Re-do GIF with Switch emulator in it
- Add Xbox Emulator
From 3f97fab34a266d9cd5409ed5c058690832175219 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 20:12:44 +1000
Subject: [PATCH 12/19] Add PS3
---
.gitignore | 22 +++++++++++++++++++++-
.vscode/settings.json | 3 +++
prepare.ps1 | 27 +++++++++++++++++++++++++--
3 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 .vscode/settings.json
diff --git a/.gitignore b/.gitignore
index a6a87f3..1a02be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,22 @@
requirements
-debug.log
\ No newline at end of file
+debug.log
+assets/*
+*.dll
+retroarch*
+assets/
+autoconfig/
+bearer/
+database/
+filters/
+iconengines/
+imageformats/
+info/
+overlays/
+platforms/
+saves/
+screenshots/
+shaders/
+states/
+styles
+system/
+qt.conf
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..3b66410
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "git.ignoreLimitWarning": true
+}
\ No newline at end of file
diff --git a/prepare.ps1 b/prepare.ps1
index 476ac79..7e0a03f 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -108,10 +108,12 @@ Write-Host "INFO: Installing Citra Nightly"
scoop install citra-nightly
scoop install ppsspp
scoop install yuzu
+scoop install rpcs3
$citraInstallDir = "$env:userprofile\scoop\apps\citra-nightly\current"
$ppssppInstallDir = "$env:userprofile\scoop\apps\ppsspp\current"
$yuzuInstallDir = "$env:userprofile\scoop\apps\yuzu\current"
+$rpcs3InstallDir = "$env:userprofile\scoop\apps\rpcs3\current"
choco install 7zip --no-progress -y | Out-Null
choco install dolphin --pre --no-progress -y | Out-Null
@@ -366,6 +368,18 @@ else {
exit -1
}
+Write-Host "INFO: Setup PS3"
+$ps3Path = "$romPath\ps3"
+# $ps3Rom = "$requirementsFolder\to-do.nro"
+if (Test-Path $ps3Rom) {
+ New-Item -ItemType Directory -Force -Path $ps3Path | Out-Null
+ Move-Item -Path $ps3Rom -Destination $ps3Path | Out-Null
+}
+else {
+ Write-Host "ERROR: $ps3Rom not found."
+ exit -1
+}
+
Write-Host "INFO: Setup Xbox"
$xboxEmuZip = "$requirementsFolder\xemu-win-release.zip"
if (Test-Path $xboxEmuZip) {
@@ -617,7 +631,7 @@ $newConfig = "
C:\Program Files\Vita3k\Vita3K.exe --vpk-path %ROM%
vita
vita
-
+
switch
Switch
@@ -627,7 +641,16 @@ $newConfig = "
switch
switch
-
+
+ ps3
+ PS3
+ $ps3Path
+ .iso .ISO .zip .ZIP .7z .nso .NSO .nro .NRO .nca .NCA .xci .XCI
+ $rpcs3InstallDir\yuzu.exe %ROM%
+ switch
+ switch
+
+
psp
Playstation Portable
$pspPath
From f7ffda262a68cc3c155d91e68b423ac64dc00bdb Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 20:20:49 +1000
Subject: [PATCH 13/19] No ps3 rom yet, bump timeout
---
prepare.ps1 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/prepare.ps1 b/prepare.ps1
index 7e0a03f..440133d 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -133,7 +133,7 @@ Start-Process "$requirementsFolder\emulationstation_win32_latest.exe" -ArgumentL
& "${env:ProgramFiles(x86)}\EmulationStation\emulationstation.exe"
while (!(Test-Path "$env:userprofile\.emulationstation\es_systems.cfg")) {
Write-Host "INFO: Checking for config file..."
- Start-Sleep 5
+ Start-Sleep 10
}
Write-Host "INFO: Config file generated"
Stop-Process -Name "emulationstation"
@@ -371,14 +371,14 @@ else {
Write-Host "INFO: Setup PS3"
$ps3Path = "$romPath\ps3"
# $ps3Rom = "$requirementsFolder\to-do.nro"
-if (Test-Path $ps3Rom) {
- New-Item -ItemType Directory -Force -Path $ps3Path | Out-Null
- Move-Item -Path $ps3Rom -Destination $ps3Path | Out-Null
-}
-else {
- Write-Host "ERROR: $ps3Rom not found."
- exit -1
-}
+# if (Test-Path $ps3Rom) {
+# New-Item -ItemType Directory -Force -Path $ps3Path | Out-Null
+# Move-Item -Path $ps3Rom -Destination $ps3Path | Out-Null
+# }
+# else {
+# Write-Host "ERROR: $ps3Rom not found."
+# exit -1
+# }
Write-Host "INFO: Setup Xbox"
$xboxEmuZip = "$requirementsFolder\xemu-win-release.zip"
From 0763f284c0cc3cb76e68853b972236b357d072ad Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 20:43:25 +1000
Subject: [PATCH 14/19] Made script more rerunnable
---
prepare.ps1 | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/prepare.ps1 b/prepare.ps1
index 440133d..16c5c00 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -8,7 +8,7 @@ function DownloadFiles {
$url = $_.url
$file = $_.file
- $output = "$requirementsFolder\$file"
+ $output = "$requirementsFolder\$file"
if(![System.IO.File]::Exists($output)){
@@ -68,8 +68,6 @@ function GithubReleaseFiles {
Write-Host $file "INFO: Already exists...Skipping download."
}
- Get-ChildItem $requirementsFolder
-
}
}
@@ -127,6 +125,7 @@ DownloadFiles("other_downloads")
GithubReleaseFiles
# Install Emulation Station
+Write-Host "INFO: Starting Emulation station to generate config"
Start-Process "$requirementsFolder\emulationstation_win32_latest.exe" -ArgumentList "/S" -Wait
# Generate Emulation Station config file
@@ -144,9 +143,9 @@ $coresPath = "$retroArchPath\cores"
$retroArchBinary = "$requirementsFolder\RetroArch.7z"
if(Test-Path $retroArchBinary){
New-Item -ItemType Directory -Force -Path $retroArchPath | Out-Null
- Expand-Archive -Path $retroArchBinary -Destination . | Out-Null
+ Expand-Archive -Path $retroArchBinary -Destination $retroArchPath | Out-Null
# TO-DO - add an Out-Null when this has been tested
- Copy-Item -Path RetroArch-Win64\* -Destination $retroArchPath -recurse -Force
+ # Copy-Item -Path RetroArch-Win64\* -Destination $retroArchPath -recurse -Force
# New path - $retroArchPath\RetroArch-Win64
} else {
@@ -349,7 +348,7 @@ $pspPath = "$romPath\psp"
$pspRom = "$requirementsFolder\cube.elf"
if (Test-Path $pspRom) {
New-Item -ItemType Directory -Force -Path $pspPath | Out-Null
- Move-Item -Path $pspRom -Destination $pspPath | Out-Null
+ Move-Item -Path $pspRom -Destination $pspPath -Force | Out-Null
}
else {
Write-Host "ERROR: $pspRom not found."
@@ -361,7 +360,7 @@ $switchPath = "$romPath\switch"
$switchRom = "$requirementsFolder\tetriswitch.nro"
if (Test-Path $switchRom) {
New-Item -ItemType Directory -Force -Path $switchPath | Out-Null
- Move-Item -Path $switchRom -Destination $switchPath | Out-Null
+ Move-Item -Path $switchRom -Destination $switchPath -Force | Out-Null
}
else {
Write-Host "ERROR: $switchRom not found."
@@ -401,7 +400,7 @@ $vitaPath = "$romPath\vita"
$vitaRom = "$requirementsFolder\C4.vpk"
if (Test-Path $vitaRom) {
New-Item -ItemType Directory -Force -Path $vitaPath | Out-Null
- Move-Item -Path $vitaRom -Destination $vitaPath | Out-Null
+ Move-Item -Path $vitaRom -Destination $vitaPath -Force | Out-Null
}
else {
Write-Host "ERROR: $vitaRom not found."
@@ -427,7 +426,7 @@ $3dsPath = "$romPath\3ds"
$3dsRom = "$requirementsFolder\ccleste.3dsx"
if (Test-Path $3dsRom) {
New-Item -ItemType Directory -Force -Path $3dsPath | Out-Null
- Move-Item -Path $3dsRom -Destination $3dsPath | Out-Null
+ Move-Item -Path $3dsRom -Destination $3dsPath -Force | Out-Null
}
else {
Write-Host "ERROR: $3dsRom not found."
@@ -895,7 +894,7 @@ Write-Host "INFO: Update EmulationStation binaries"
$emulationStationInstallFolder = "${env:ProgramFiles(x86)}\EmulationStation"
$updatedEmulationStatonBinaries = "$requirementsFolder\EmulationStation-Win32.zip"
if(Test-Path $updatedEmulationStatonBinaries){
- Expand-Archive -Path $updatedEmulationStatonBinaries -Destination $emulationStationInstallFolder | Out-Null
+ Expand-Archive -Path $updatedEmulationStatonBinaries -Destination $emulationStationInstallFolder -Force | Out-Null
} else {
Write-Host "ERROR: $updatedEmulationStatonBinaries not found."
exit -1
@@ -1133,7 +1132,7 @@ AspectRatio = 1
Screensaver = 0
"
-New-Item $dolphinConfigFolder -ItemType directory | Out-Null
+New-Item $dolphinConfigFolder -ItemType directory -Force | Out-Null
Write-Output $dolphinConfigFileContent > $dolphinConfigFile
# TO-DO: Review if this is still needed or not
From b2d134367a4a00a32eec5fb2a8d343a1520285aa Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 20:47:42 +1000
Subject: [PATCH 15/19] use the force luke
---
prepare.ps1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/prepare.ps1 b/prepare.ps1
index 16c5c00..763b81b 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -415,7 +415,7 @@ if(-not(Test-Path $vita3kInstallFolder)){
$vita3kLatestBuild = "$requirementsFolder\windows-latest.zip"
if(Test-Path $vita3kLatestBuild){
- Expand-Archive -Path $vita3kLatestBuild -Destination $vita3kInstallFolder | Out-Null
+ Expand-Archive -Path $vita3kLatestBuild -Destination $vita3kInstallFolder -force | Out-Null
} else {
Write-Host "ERROR: $vita3kLatestBuild not found."
exit -1
@@ -882,7 +882,7 @@ Write-Host "INFO: Setting up Emulation Station theme recalbox-backport"
$themesPath = "$env:userprofile\.emulationstation\themes\recalbox-backport\"
$themesFile = "$requirementsFolder\recalbox-backport-v2.2.zip"
if(Test-Path $themesFile){
- Expand-Archive -Path $themesFile -Destination $requirementsFolder | Out-Null
+ Expand-Archive -Path $themesFile -Destination $requirementsFolder -Force | Out-Null
$themesFolder = "$requirementsFolder\recalbox-backport\"
robocopy $themesFolder $themesPath /E /NFL /NDL /NJH /NJS /nc /ns /np | Out-Null
} else {
From 153e28454af2391082ad2de0b59f986e76bd41e9 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 21:41:12 +1000
Subject: [PATCH 16/19] Add ps3 rom, scrap xbox
---
README.md | 5 -----
download_list.json | 4 ++++
prepare.ps1 | 32 ++++++++------------------------
3 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/README.md b/README.md
index 1a3ea8c..d42dcc4 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,6 @@ TO-DO
-----
- Fix scraper with . in path name
- Re-do GIF with Switch emulator in it
-- Add Xbox Emulator
-- Add Xbox art
-- Add Xbox 360 emulator
-- Add Xbox 360 art
-
Features
------
diff --git a/download_list.json b/download_list.json
index 73b04d9..8cad562 100644
--- a/download_list.json
+++ b/download_list.json
@@ -123,6 +123,10 @@
{
"file": "C4.vpk",
"url": "https://dl.coolatoms.org/vitadb/C4.vpk"
+ },
+ {
+ "file": "UP0001-THATOPONG_00-0000000000000000-A0100-V0100-RE.pkg",
+ "url": "https://www.psx-place.com/resources/that-other-pong.479/download?version=645"
}
],
"releases": [
diff --git a/prepare.ps1 b/prepare.ps1
index 763b81b..031c0d2 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -369,32 +369,16 @@ else {
Write-Host "INFO: Setup PS3"
$ps3Path = "$romPath\ps3"
-# $ps3Rom = "$requirementsFolder\to-do.nro"
-# if (Test-Path $ps3Rom) {
-# New-Item -ItemType Directory -Force -Path $ps3Path | Out-Null
-# Move-Item -Path $ps3Rom -Destination $ps3Path | Out-Null
-# }
-# else {
-# Write-Host "ERROR: $ps3Rom not found."
-# exit -1
-# }
-
-Write-Host "INFO: Setup Xbox"
-$xboxEmuZip = "$requirementsFolder\xemu-win-release.zip"
-if (Test-Path $xboxEmuZip) {
- $xboxEmuPath = "$env:userprofile\.emulationstation\systems\xbox\"
- New-Item -ItemType Directory -Force -Path $xboxEmuPath | Out-Null
- Expand-Archive -Path $xboxEmuZip -Destination $xboxEmuPath | Out-Null
+$ps3Rom = "$requirementsFolder\UP0001-THATOPONG_00-0000000000000000-A0100-V0100-RE.pkg"
+if (Test-Path $ps3Rom) {
+ New-Item -ItemType Directory -Force -Path $ps3Path | Out-Null
+ Move-Item -Path $ps3Rom -Destination $ps3Path | Out-Null
}
else {
- Write-Host "ERROR: $xboxEmuZip not found."
+ Write-Host "ERROR: $ps3Rom not found."
exit -1
}
-# TO-DO: Deal with roms
-$xboxRomPath = "$romPath\xbox"
-
-
Write-Host "INFO: Setup PS Vita"
$vitaPath = "$romPath\vita"
$vitaRom = "$requirementsFolder\C4.vpk"
@@ -644,10 +628,10 @@ $newConfig = "
ps3
PS3
$ps3Path
- .iso .ISO .zip .ZIP .7z .nso .NSO .nro .NRO .nca .NCA .xci .XCI
+ .iso .ISO .zip .ZIP .7z .pkg .PKG
$rpcs3InstallDir\yuzu.exe %ROM%
- switch
- switch
+ ps3
+ ps3
psp
From 878bb2b0c6173e62ce0d1c8190f0672acb059749 Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 21:49:30 +1000
Subject: [PATCH 17/19] Update README.md
---
README.md | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index d42dcc4..8aaf167 100644
--- a/README.md
+++ b/README.md
@@ -7,15 +7,12 @@ EmulationStation configured for Windows
An auto-installer to set up Emulation Station correctly on a 64-bit version of Windows 10/11
-TO-DO
------
-- Fix scraper with . in path name
-- Re-do GIF with Switch emulator in it
Features
------
- Uses an up to date version of Emulation Station from the Raspberry Pi branch
- Auto populates emulators with public domain roms
+- Adds exclusive Windows only Emulators and Themes for Switch and Wii-U
- Auto installs a popular theme with support for adding 'Favorites'
- Adds multiple useful shortcuts to the user's Desktop
- Adds in a game content scraper which lives in (run %UserProfile%\\.emulationstation\roms\scraper.exe)
@@ -38,14 +35,15 @@ INFO: Setup completed
Troubleshooting
------
- If the controller is not working in game, configure Input in Retroarch (%UserProfile%\\.emulationstation\systems\retroarch\retroarch.exe)
-- PSX and PS2 Homebrew Games won't load unless you acquire the bios's and add them to the bios folder (%UserProfile%\\.emulationstation\systems\epsxe\bios and %UserProfile%\\.emulationstation\systems\pcsx2\bios)
-- PSX and PS2 also require manual configuration for controllers (%UserProfile%\\.emulationstation\systems\epsxe\ePSXe.exe and %UserProfile%\\.emulationstation\systems\pcsx2\pcsx2.exe)
+- PSX, PS2 and PS3 Homebrew Games won't load unless you acquire the bios's and add them to the bios folder (%UserProfile%\\.emulationstation\systems\epsxe\bios and %UserProfile%\\.emulationstation\systems\pcsx2\bios)
+- PSX, PS2 and PS3 also require manual configuration for controllers (%UserProfile%\\.emulationstation\systems\epsxe\ePSXe.exe and %UserProfile%\\.emulationstation\systems\pcsx2\pcsx2.exe and %UserProfile%\\scoop\apps\rpcs3\current)
- If the script fails for whatever reason delete the contents of %UserProfile%\\.emulationstation and try again.
- Emulation Station may crash when you return to it from a external progam, ensure your graphics drivers are up to date.
- Launching a Retroarch rom may return you to ES, you're probably on a 32-bit verison of Windows and need to acquire seperate cores.
- Powershell commands may fail, ensure your Powershell session is in Admin mode.
- If Powershell complains about syntax you're probably somehow running a Powershell version lower than 5. Run 'choco install powershell -y' to update.
- If you are using Xbox controllers and having trouble setting the guide button as hotkey, locate the file (%UserProfile%\\.emulationstation\es_input.cfg and change the line for hotkeyenable to ``````
+- The script is now re-runnable, so if anything fails, re-run it and it'll pick itself back up if your internet has died half-way through
- If you are unable to run script from context menu (right mouse button), revert default "Open with" to Notepad
#### Windowed Mode Execution:
From 9f420f97b6cbb36e7032f0aa3930748b4561c67d Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 21:49:54 +1000
Subject: [PATCH 18/19] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8aaf167..8388ac9 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Features
------
- Uses an up to date version of Emulation Station from the Raspberry Pi branch
- Auto populates emulators with public domain roms
-- Adds exclusive Windows only Emulators and Themes for Switch and Wii-U
+- Adds exclusive Windows only Emulators and Themes for the Switch, Wii-U and PS3
- Auto installs a popular theme with support for adding 'Favorites'
- Adds multiple useful shortcuts to the user's Desktop
- Adds in a game content scraper which lives in (run %UserProfile%\\.emulationstation\roms\scraper.exe)
From 3fccce1e7ebe9515ca2b04ba4fdddc6714d8b58f Mon Sep 17 00:00:00 2001
From: Chris Franco <11533365+Francommit@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:10:48 +1000
Subject: [PATCH 19/19] Weird
---
prepare.ps1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/prepare.ps1 b/prepare.ps1
index 031c0d2..61dc208 100644
--- a/prepare.ps1
+++ b/prepare.ps1
@@ -143,9 +143,9 @@ $coresPath = "$retroArchPath\cores"
$retroArchBinary = "$requirementsFolder\RetroArch.7z"
if(Test-Path $retroArchBinary){
New-Item -ItemType Directory -Force -Path $retroArchPath | Out-Null
- Expand-Archive -Path $retroArchBinary -Destination $retroArchPath | Out-Null
+ Expand-Archive -Path $retroArchBinary -Destination . | Out-Null
# TO-DO - add an Out-Null when this has been tested
- # Copy-Item -Path RetroArch-Win64\* -Destination $retroArchPath -recurse -Force
+ Copy-Item -Path RetroArch-Win64\* -Destination $retroArchPath -recurse -Force
# New path - $retroArchPath\RetroArch-Win64
} else {