Final Burn Alpha

Aftnet · Sep 7, 2017 · 3666ea8 · 3666ea8
1 parent e26f6a1
commit 3666ea8
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 71 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -36,7 +36,7 @@
 	branch = master
 [submodule "ParallelN64/src"]
 	path = ParallelN64/src
-	url = https://github.com/Aftnet/parallel-n64.git
+	url = https://github.com/libretro/parallel-n64.git
 	branch = master
 [submodule "BeetleWswan/src"]
 	path = BeetleWswan/src
@@ -60,5 +60,5 @@
 	branch = master
 [submodule "FBAlpha/src"]
 	path = FBAlpha/src
-	url = https://github.com/Aftnet/fbalpha.git
+	url = https://github.com/libretro/fbalpha.git
 	branch = master
diff --git a/BeetlePSX/src b/BeetlePSX/src
diff --git a/FBAlpha/src b/FBAlpha/src
diff --git a/FCEUMM/src b/FCEUMM/src
diff --git a/GPGX/src b/GPGX/src
diff --git a/Nestopia/src b/Nestopia/src
diff --git a/ParallelN64/src b/ParallelN64/src
diff --git a/RetriX.UWP/Package.appxmanifest b/RetriX.UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="15612Aftnet.RetriX" Publisher="CN=Alberto Fustinoni, O=AlbertoFustinoni, L=Kawasaki, S=Kanagawa, C=JP" Version="1.7.13.0" />
+  <Identity Name="15612Aftnet.RetriX" Publisher="CN=Alberto Fustinoni, O=AlbertoFustinoni, L=Kawasaki, S=Kanagawa, C=JP" Version="1.8.14.0" />
   <mp:PhoneIdentity PhoneProductId="efc54b08-6566-4c74-810c-e9437145cdf4" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppName\Text</DisplayName>
@@ -28,60 +28,63 @@
       </uap:VisualElements>
       <Extensions>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="ndsroms">
-            <uap:DisplayName>ms-resource:DSRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="pcengineroms">
+            <uap:DisplayName>ms-resource:PCEngineRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:DSRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:PCEngineRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.nds</uap:FileType>
+              <uap:FileType>.pce</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="snesroms">
-            <uap:DisplayName>ms-resource:SNESRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="ngproms">
+            <uap:DisplayName>ms-resource:NeoGeoPocketRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:SNESRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:NeoGeoPocketRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.smc</uap:FileType>
-              <uap:FileType>.sfc</uap:FileType>
-              <uap:FileType>.swc</uap:FileType>
-              <uap:FileType>.fig</uap:FileType>
+              <uap:FileType>.ngp</uap:FileType>
+              <uap:FileType>.ngc</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="nesrom">
-            <uap:DisplayName>ms-resource:NESRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="ps1roms">
+            <uap:DisplayName>ms-resource:PlayStationRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:NESRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:PlayStationRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.fds</uap:FileType>
-              <uap:FileType>.nes</uap:FileType>
-              <uap:FileType>.unf</uap:FileType>
-              <uap:FileType>.unif</uap:FileType>
+              <uap:FileType>.pbp</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="gbroms">
-            <uap:DisplayName>ms-resource:GameBoyRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="sgroms">
+            <uap:DisplayName>ms-resource:SG1000RomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:GameBoyRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:SG1000RomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.gb</uap:FileType>
-              <uap:FileType>.gbc</uap:FileType>
-              <uap:FileType>.dmg</uap:FileType>
+              <uap:FileType>.sg</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="gbaroms">
-            <uap:DisplayName>ms-resource:GameBoyAdvanceRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="gamegearroms">
+            <uap:DisplayName>ms-resource:GameGearRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:GameBoyAdvanceRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:GameGearRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.gba</uap:FileType>
+              <uap:FileType>.gg</uap:FileType>
+            </uap:SupportedFileTypes>
+          </uap:FileTypeAssociation>
+        </uap:Extension>
+        <uap:Extension Category="windows.fileTypeAssociation">
+          <uap:FileTypeAssociation Name="mastersystemroms">
+            <uap:DisplayName>ms-resource:MasterSystemRomDescription\Text</uap:DisplayName>
+            <uap:Logo>Assets\FileIcon.png</uap:Logo>
+            <uap:InfoTip>ms-resource:MasterSystemRomDescription\Text</uap:InfoTip>
+            <uap:SupportedFileTypes>
+              <uap:FileType>.sms</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
@@ -99,63 +102,60 @@
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="mastersystemroms">
-            <uap:DisplayName>ms-resource:MasterSystemRomDescription\Text</uap:DisplayName>
-            <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:MasterSystemRomDescription\Text</uap:InfoTip>
-            <uap:SupportedFileTypes>
-              <uap:FileType>.sms</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
-        <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="gamegearroms">
-            <uap:DisplayName>ms-resource:GameGearRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="gbaroms">
+            <uap:DisplayName>ms-resource:GameBoyAdvanceRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:GameGearRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:GameBoyAdvanceRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.gg</uap:FileType>
+              <uap:FileType>.gba</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="sgroms">
-            <uap:DisplayName>ms-resource:SG1000RomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="gbroms">
+            <uap:DisplayName>ms-resource:GameBoyRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:SG1000RomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:GameBoyRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.sg</uap:FileType>
+              <uap:FileType>.gb</uap:FileType>
+              <uap:FileType>.gbc</uap:FileType>
+              <uap:FileType>.dmg</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="ps1roms">
-            <uap:DisplayName>ms-resource:PlayStationRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="nesrom">
+            <uap:DisplayName>ms-resource:NESRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:PlayStationRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:NESRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.pbp</uap:FileType>
+              <uap:FileType>.fds</uap:FileType>
+              <uap:FileType>.nes</uap:FileType>
+              <uap:FileType>.unf</uap:FileType>
+              <uap:FileType>.unif</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="ngproms">
-            <uap:DisplayName>ms-resource:NeoGeoPocketRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="snesroms">
+            <uap:DisplayName>ms-resource:SNESRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:NeoGeoPocketRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:SNESRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.ngp</uap:FileType>
-              <uap:FileType>.ngc</uap:FileType>
+              <uap:FileType>.smc</uap:FileType>
+              <uap:FileType>.sfc</uap:FileType>
+              <uap:FileType>.swc</uap:FileType>
+              <uap:FileType>.fig</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="pcengineroms">
-            <uap:DisplayName>ms-resource:PCEngineRomDescription\Text</uap:DisplayName>
+          <uap:FileTypeAssociation Name="ndsroms">
+            <uap:DisplayName>ms-resource:DSRomDescription\Text</uap:DisplayName>
             <uap:Logo>Assets\FileIcon.png</uap:Logo>
-            <uap:InfoTip>ms-resource:PCEngineRomDescription\Text</uap:InfoTip>
+            <uap:InfoTip>ms-resource:DSRomDescription\Text</uap:InfoTip>
             <uap:SupportedFileTypes>
-              <uap:FileType>.pce</uap:FileType>
+              <uap:FileType>.nds</uap:FileType>
             </uap:SupportedFileTypes>
           </uap:FileTypeAssociation>
         </uap:Extension>

diff --git a/RetriX.UWP/RetriX.UWP.csproj b/RetriX.UWP/RetriX.UWP.csproj
@@ -23,6 +23,7 @@
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/RetriX.UWP/Services/EmulationService.cs b/RetriX.UWP/Services/EmulationService.cs
@@ -92,8 +92,9 @@ public EmulationService(IUserDialogs dialogsService, ILocalizationService locali
                 new ViewModels.GameSystemVM(BeetlePCEFastRT.BeetlePCEFastCore.Instance, LocalizationService, "SystemNamePCEngineCD", "ManufacturerNameNEC", "\uf124", false, new HashSet<string>{ ".cue", ".ccd" }, CDImageExtensions),
                 new ViewModels.GameSystemVM(BeetlePCFXRT.BeetlePCFXCore.Instance, LocalizationService, "SystemNamePCFX", "ManufacturerNameNEC", "\uf124", false, new HashSet<string>{ ".cue", ".ccd", ".toc" }, CDImageExtensions),
                 new ViewModels.GameSystemVM(BeetleWswanRT.BeetleWswanCore.Instance, LocalizationService, "SystemNameWonderSwan", "ManufacturerNameBandai", "\uf129"),
+                new ViewModels.GameSystemVM(FBAlphaRT.FBAlphaCore.Instance, LocalizationService, "SystemNameNeoGeo", "ManufacturerNameSNK", "\uf102", false),
                 new ViewModels.GameSystemVM(BeetleNGPRT.BeetleNGPCore.Instance, LocalizationService, "SystemNameNeoGeoPocket", "ManufacturerNameSNK", "\uf129"),
-                new ViewModels.GameSystemVM(FBAlphaRT.FBAlphaCore.Instance, LocalizationService, "SystemNameArcade", "ManufacturerNameFBAlpha", "\uf102"),
+                new ViewModels.GameSystemVM(FBAlphaRT.FBAlphaCore.Instance, LocalizationService, "SystemNameArcade", "ManufacturerNameFBAlpha", "\uf102", true),
                 };
 
                 var allCores = systems.Select(d => d.Core).Distinct().ToArray();

diff --git a/RetriX.UWP/Strings/en-US/Resources.resw b/RetriX.UWP/Strings/en-US/Resources.resw
@@ -350,4 +350,7 @@ Restart RetriX and try again.</value>
   <data name="SystemNameArcade" xml:space="preserve">
     <value>Arcade</value>
   </data>
+  <data name="SystemNameNeoGeo" xml:space="preserve">
+    <value>Neo Geo</value>
+  </data>
 </root>
diff --git a/readme.md b/readme.md
@@ -18,10 +18,13 @@ Libretro core used in parentheses
 - Game Gear (Genesis Plus GX)
 - Mega Drive (Genesis Plus GX)
 - PlayStation (Genesis Plus GX)
-- NeoGeo Pocket (BeetleNGP)
+- Neo Geo (Final Burn Alpha)
+- Neo Geo Pocket (BeetleNGP)
 - Wonderswan (BeetleWSwan)
 - PC Engine (BeetlePCEFast)
+- PC-FX (Beetle PCFX)
 - PlayStation (BeetlePSX)
+- Arcade (Final Burn Alpha)
 
 ## Demo
 
@@ -69,7 +72,7 @@ The project makes extensive use of [Git submodules](https://git-scm.com/docs/git
 ## Current state
 
 - Created a framework to speed up porting of software rendering based Libretro cores to WinRT components
-- Ported GenesisPlusGX, Snes9x, FCEUMM, Nestopia (doesn't work well, using FCEUMM instead), VBAM, Ganbatte, BeetlePSX and MelonDS
+- Ported GenesisPlusGX, Snes9x, FCEUMM, Nestopia (doesn't work well, using FCEUMM instead), VBAM, Ganbatte, BeetlePSX, Beetle PCEFast, Beetle PCFX, Final Burn Alpha, MelonDS
 - Created audio player WinRT components to interop between Libretro's audio rendering interface and Windows 10's [AudioGraph](https://docs.microsoft.com/en-us/windows/uwp/audio-video-camera/audio-graphs) API
 - Created input manager WinRT component to interop between Libretro's input polling interface and Windows 10's [Gamepad APIs](https://docs.microsoft.com/en-us/uwp/api/windows.gaming.input.gamepad)
 - Created [Win2D/Angle](https://github.com/Microsoft/Win2D) based video renderer. Supports software based Libretro cores.