diff --git a/.vs/Emuloader/v16/.suo b/.vs/Emuloader/v16/.suo index 0c16b04..fa9a9db 100644 Binary files a/.vs/Emuloader/v16/.suo and b/.vs/Emuloader/v16/.suo differ diff --git a/W Emuloader/bin/Debug/Emuloader.pdb b/W Emuloader/bin/Debug/Emuloader.pdb index f3ba308..196258f 100644 Binary files a/W Emuloader/bin/Debug/Emuloader.pdb and b/W Emuloader/bin/Debug/Emuloader.pdb differ diff --git a/W Emuloader/bin/Debug/resources/duckstation.png b/W Emuloader/bin/Debug/resources/duckstation.png new file mode 100644 index 0000000..5261daa Binary files /dev/null and b/W Emuloader/bin/Debug/resources/duckstation.png differ diff --git a/W Emuloader/bin/Debug/settings.dat b/W Emuloader/bin/Debug/settings.dat index d8304ec..5d9ae41 100644 --- a/W Emuloader/bin/Debug/settings.dat +++ b/W Emuloader/bin/Debug/settings.dat @@ -1,6 +1,6 @@ load=1 dark=0 -version=1.0.1 +version=1.1.0 autoupdate=1 exitonx=0 fancydl=0 diff --git a/W Emuloader/load_functions.vb b/W Emuloader/load_functions.vb index 2f9cbd3..3d8d9d7 100644 --- a/W Emuloader/load_functions.vb +++ b/W Emuloader/load_functions.vb @@ -428,6 +428,10 @@ Module load_functions emutabs(index).Text = "yuzu" emutabs(index).Visible = True currentmetadata = File.ReadAllLines(".\" & eldr_entry & "\yuzu.eldr") + ElseIf eldr_entry.Contains("DUCKSTATION") Then + emutabs(index).Text = "DuckStation" + emutabs(index).Visible = True + currentmetadata = File.ReadAllLines(".\" & eldr_entry & "\duckstation.eldr") End If emu_tab_metadata_list.emutabs_metadata(index) = currentmetadata index = index + 1 diff --git a/W Emuloader/main.vb b/W Emuloader/main.vb index cc7a015..dc79bc6 100644 --- a/W Emuloader/main.vb +++ b/W Emuloader/main.vb @@ -17,7 +17,7 @@ Public Class main Public Shared labelgrey As Color Public Shared tab_index = 0 Public Shared dark = 0 - Public Shared version_number = "1.0.1" + Public Shared version_number = "1.1.0" Public Shared global_settings As New List(Of String) Public Shared boxart_url As String Dim emulator As Process @@ -2155,9 +2155,6 @@ x.SubItems(4).Text, "Queued", timestamp})) Case "NES" platform_id = "NES" emulator_exe.Arguments = ("Mesen " & """" & rom_path & """ " & params) - Case "PSX" - platform_id = "PSX" - emulator_exe.Arguments = ("-loadbin " & """" & rom_path & """ " & params) Case "MGD" platform_id = "MGD" emulator_exe.Arguments = ("""" & rom_path & """ " & params) @@ -2171,6 +2168,13 @@ x.SubItems(4).Text, "Queued", timestamp})) platform_id = "SWH" emulator_exe.Arguments = ("""" & rom_path & """ " & params) End Select + If currenttab_metadata(1) = "PSX" And currenttab_metadata(0) = "ePSXe" Then + platform_id = "PSX" + emulator_exe.Arguments = ("-loadbin " & """" & rom_path & """ " & params) + ElseIf currenttab_metadata(1) = "PSX" And currenttab_metadata(0) = "DuckStation" Then + platform_id = "PSX" + emulator_exe.Arguments = ("""" & rom_path & """ " & params) + End If If checkbox_fullscreen.Checked = True Then emulator_exe.WindowStyle = ProcessWindowStyle.Maximized Else @@ -2419,7 +2423,4 @@ x.SubItems(4).Text, "Queued", timestamp})) btn_help.BackgroundImage = System.Drawing.Image.FromFile(".\resources\helpwhite.png") End Sub - Private Sub panel_rom_info_Paint(sender As Object, e As PaintEventArgs) Handles panel_rom_info.Paint - - End Sub End Class \ No newline at end of file diff --git a/W Emuloader/module_emulatorupdater.vb b/W Emuloader/module_emulatorupdater.vb index acf6424..35c73c4 100644 --- a/W Emuloader/module_emulatorupdater.vb +++ b/W Emuloader/module_emulatorupdater.vb @@ -143,6 +143,15 @@ Module module_emulatorupdater Else Call main.launch_emulator() End If + Case "DuckStation" + Dim newversion As String() = uptodate_list(14).Split(",") + If Not main.currenttab_metadata(5) = newversion(4) Then + Dim arguments As String() + arguments = {newversion(0)} + main.thread_emulator_update.RunWorkerAsync(arguments) + Else + Call main.launch_emulator() + End If End Select diff --git a/W Emuloader/newemulator.vb b/W Emuloader/newemulator.vb index 585ad80..9c88235 100644 --- a/W Emuloader/newemulator.vb +++ b/W Emuloader/newemulator.vb @@ -5,7 +5,7 @@ Imports System.ComponentModel Public Class newemulator Dim arguments As String() - Dim list_of_emulators As String() = {"Visual Boy Advance-M (GBA)", "Citra (3DS)", "DeSmuME (NDS)", "Project64 (N64)", "PPSSPP (PSP)", "Dolphin (WII)", "Cemu (WIIU)", "Snes9x (SNES)", "Mesen (NES)", "ePSXe (PSX)", "Fusion (MGD)", "Redream (DC)", "PCSX2 (PS2)", "yuzu (SWH)"} + Dim list_of_emulators As String() = {"Visual Boy Advance-M (GBA)", "Citra (3DS)", "DeSmuME (NDS)", "Project64 (N64)", "PPSSPP (PSP)", "Dolphin (WII)", "Cemu (WIIU)", "Snes9x (SNES)", "Mesen (NES)", "ePSXe (PSX)", "Fusion (MGD)", "Redream (DC)", "PCSX2 (PS2)", "yuzu (SWH)", "DuckStation (PSX)"} Dim uptodate_list As String() Dim vnumber As String @@ -116,6 +116,7 @@ Public Class newemulator My.Computer.FileSystem.WriteAllText(".\" & arguments(0) & "-" & timestamp & "\" & arguments(6), metadata, True) System.IO.File.Create(".\" & arguments(0) & "-" & timestamp & "\cmdlineargs.ini").Dispose() Directory.CreateDirectory(".\roms\" & arguments(3)) + System.IO.File.Create(".\" & arguments(0) & "-" & timestamp & "\portable.txt").Dispose() End Sub Private Sub emulator_downloader_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles emulator_downloader.RunWorkerCompleted @@ -168,7 +169,7 @@ Public Class newemulator Dim desmume As String() = uptodate_list(2).Split(",") lbl_emulator_name.Text = "DeSmuME" lbl_platform.Text = "Platform: Nintendo DS" - lbl_source.Text = "Source: Google Drive (Emuloader Repack)" + lbl_source.Text = "Source: GitHub (Emuloader Repack)" lbl_version_number.Text = desmume(4) vnumber = desmume(4) picturebox_emulogo.BackgroundImage = New System.Drawing.Bitmap(".\resources\desmume.png") @@ -176,7 +177,7 @@ Public Class newemulator Dim project64 As String() = uptodate_list(3).Split(",") lbl_emulator_name.Text = "Project64" lbl_platform.Text = "Platform: Nintendo 64" - lbl_source.Text = "Source: Google Drive (Emuloader Repack)" + lbl_source.Text = "Source: GitHub (Emuloader Repack)" lbl_version_number.Text = project64(4) vnumber = project64(4) picturebox_emulogo.BackgroundImage = New System.Drawing.Bitmap(".\resources\project64.png") @@ -192,7 +193,7 @@ Public Class newemulator Dim dolphin As String() = uptodate_list(5).Split(",") lbl_emulator_name.Text = "Dolphin" lbl_platform.Text = "Platform: Nintendo Wii (+Gamecube)" - lbl_source.Text = "Source: Google Drive (Emuloader Repack)" + lbl_source.Text = "Source: GitHub (Emuloader Repack)" lbl_version_number.Text = dolphin(4) vnumber = dolphin(4) picturebox_emulogo.BackgroundImage = New System.Drawing.Bitmap(".\resources\dolphin.png") @@ -248,7 +249,7 @@ Public Class newemulator Dim emulator_meta As String() = uptodate_list(12).Split(",") lbl_emulator_name.Text = "PCSX2" lbl_platform.Text = "Platform: Playstation 2" - lbl_source.Text = "Source: Google Drive (Emuloader Repack)" + lbl_source.Text = "Source: GitHub (Emuloader Repack)" lbl_version_number.Text = emulator_meta(4) vnumber = emulator_meta(4) picturebox_emulogo.BackgroundImage = New System.Drawing.Bitmap(".\resources\pcsx2.png") @@ -260,7 +261,14 @@ Public Class newemulator lbl_version_number.Text = emulator_meta(4) vnumber = emulator_meta(4) picturebox_emulogo.BackgroundImage = New System.Drawing.Bitmap(".\resources\yuzu.png") - + Case "DuckStation (PSX)" + Dim emulator_meta As String() = uptodate_list(14).Split(",") + lbl_emulator_name.Text = "DuckStation" + lbl_platform.Text = "Platform: Sony Playstation" + lbl_source.Text = "Source: Github" + lbl_version_number.Text = emulator_meta(4) + vnumber = emulator_meta(4) + picturebox_emulogo.BackgroundImage = New System.Drawing.Bitmap(".\resources\duckstation.png") End Select End If End Sub @@ -355,13 +363,26 @@ Public Class newemulator emulator_downloader.RunWorkerAsync(arguments) main.lbl_status.Text = "Installing PCSX2 (PS2)" Call center_status_lbl() - MessageBox.Show("PCSX2 requires a PS2 Bios to function.") + Dim result = MessageBox.Show("PCSX2 requires a PS2 Bios to function. Would you like to find out more, or where to get one?", "BIOS Required", MessageBoxButtons.YesNo) + If result = DialogResult.Yes Then + Process.Start("https://tungstencore.com/docs/pcsx2-bios/") + End If Case "yuzu (SWH)" Dim emulator_meta As String() = uptodate_list(13).Split(",") arguments = {"YUZU", emulator_meta(0), emulator_meta(1), "SWH", emulator_meta(2), "yuzu", "yuzu.eldr", emulator_meta(3), vnumber} emulator_downloader.RunWorkerAsync(arguments) main.lbl_status.Text = "Installing yuzu (SWH)" Call center_status_lbl() + Case "DuckStation (PSX)" + Dim emulator_meta As String() = uptodate_list(14).Split(",") + arguments = {"DUCKSTATION", emulator_meta(0), emulator_meta(1), "PSX", emulator_meta(2), "DuckStation", "duckstation.eldr", emulator_meta(3), vnumber} + emulator_downloader.RunWorkerAsync(arguments) + main.lbl_status.Text = "Installing DuckStation (PSX)" + Call center_status_lbl() + Dim result = MessageBox.Show("DuckStation requires a PS1 Bios to function. Would you like to find out more, or where to get one?", "BIOS Required", MessageBoxButtons.YesNo) + If result = DialogResult.Yes Then + Process.Start("https://tungstencore.com/docs/duckstation-bios/") + End If End Select main.picturebox_loading.Visible = True MessageBox.Show(arguments(5) & " will be installed") diff --git a/W Emuloader/obj/Debug/Emuloader.pdb b/W Emuloader/obj/Debug/Emuloader.pdb index f3ba308..196258f 100644 Binary files a/W Emuloader/obj/Debug/Emuloader.pdb and b/W Emuloader/obj/Debug/Emuloader.pdb differ diff --git a/W Emuloader/obj/Debug/Emuloader.vbprojAssemblyReference.cache b/W Emuloader/obj/Debug/Emuloader.vbprojAssemblyReference.cache index d79c54e..5d2a925 100644 Binary files a/W Emuloader/obj/Debug/Emuloader.vbprojAssemblyReference.cache and b/W Emuloader/obj/Debug/Emuloader.vbprojAssemblyReference.cache differ