Skip to content

Commit 3666ea8

Browse files
albertofustinonialbertofustinoni
authored
Final Burn Alpha
1 parent e26f6a1 commit 3666ea8

File tree

12 files changed

+79
-71
lines changed

12 files changed

+79
-71
lines changed

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
branch = master
3737
[submodule "ParallelN64/src"]
3838
path = ParallelN64/src
39-
url = https://github.com/Aftnet/parallel-n64.git
39+
url = https://github.com/libretro/parallel-n64.git
4040
branch = master
4141
[submodule "BeetleWswan/src"]
4242
path = BeetleWswan/src
@@ -60,5 +60,5 @@
6060
branch = master
6161
[submodule "FBAlpha/src"]
6262
path = FBAlpha/src
63-
url = https://github.com/Aftnet/fbalpha.git
63+
url = https://github.com/libretro/fbalpha.git
6464
branch = master

‎BeetlePSX/src

‎FBAlpha/src

Submodule src updated from 5188671 to 4739df5

‎FCEUMM/src

‎GPGX/src

Submodule src updated 92 files

‎Nestopia/src

Submodule src updated from 6254534 to 45ee909

‎ParallelN64/src

‎RetriX.UWP/Package.appxmanifest

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
3-
<Identity Name="15612Aftnet.RetriX" Publisher="CN=Alberto Fustinoni, O=AlbertoFustinoni, L=Kawasaki, S=Kanagawa, C=JP" Version="1.7.13.0" />
3+
<Identity Name="15612Aftnet.RetriX" Publisher="CN=Alberto Fustinoni, O=AlbertoFustinoni, L=Kawasaki, S=Kanagawa, C=JP" Version="1.8.14.0" />
44
<mp:PhoneIdentity PhoneProductId="efc54b08-6566-4c74-810c-e9437145cdf4" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
66
<DisplayName>ms-resource:AppName\Text</DisplayName>
@@ -28,60 +28,63 @@
2828
</uap:VisualElements>
2929
<Extensions>
3030
<uap:Extension Category="windows.fileTypeAssociation">
31-
<uap:FileTypeAssociation Name="ndsroms">
32-
<uap:DisplayName>ms-resource:DSRomDescription\Text</uap:DisplayName>
31+
<uap:FileTypeAssociation Name="pcengineroms">
32+
<uap:DisplayName>ms-resource:PCEngineRomDescription\Text</uap:DisplayName>
3333
<uap:Logo>Assets\FileIcon.png</uap:Logo>
34-
<uap:InfoTip>ms-resource:DSRomDescription\Text</uap:InfoTip>
34+
<uap:InfoTip>ms-resource:PCEngineRomDescription\Text</uap:InfoTip>
3535
<uap:SupportedFileTypes>
36-
<uap:FileType>.nds</uap:FileType>
36+
<uap:FileType>.pce</uap:FileType>
3737
</uap:SupportedFileTypes>
3838
</uap:FileTypeAssociation>
3939
</uap:Extension>
4040
<uap:Extension Category="windows.fileTypeAssociation">
41-
<uap:FileTypeAssociation Name="snesroms">
42-
<uap:DisplayName>ms-resource:SNESRomDescription\Text</uap:DisplayName>
41+
<uap:FileTypeAssociation Name="ngproms">
42+
<uap:DisplayName>ms-resource:NeoGeoPocketRomDescription\Text</uap:DisplayName>
4343
<uap:Logo>Assets\FileIcon.png</uap:Logo>
44-
<uap:InfoTip>ms-resource:SNESRomDescription\Text</uap:InfoTip>
44+
<uap:InfoTip>ms-resource:NeoGeoPocketRomDescription\Text</uap:InfoTip>
4545
<uap:SupportedFileTypes>
46-
<uap:FileType>.smc</uap:FileType>
47-
<uap:FileType>.sfc</uap:FileType>
48-
<uap:FileType>.swc</uap:FileType>
49-
<uap:FileType>.fig</uap:FileType>
46+
<uap:FileType>.ngp</uap:FileType>
47+
<uap:FileType>.ngc</uap:FileType>
5048
</uap:SupportedFileTypes>
5149
</uap:FileTypeAssociation>
5250
</uap:Extension>
5351
<uap:Extension Category="windows.fileTypeAssociation">
54-
<uap:FileTypeAssociation Name="nesrom">
55-
<uap:DisplayName>ms-resource:NESRomDescription\Text</uap:DisplayName>
52+
<uap:FileTypeAssociation Name="ps1roms">
53+
<uap:DisplayName>ms-resource:PlayStationRomDescription\Text</uap:DisplayName>
5654
<uap:Logo>Assets\FileIcon.png</uap:Logo>
57-
<uap:InfoTip>ms-resource:NESRomDescription\Text</uap:InfoTip>
55+
<uap:InfoTip>ms-resource:PlayStationRomDescription\Text</uap:InfoTip>
5856
<uap:SupportedFileTypes>
59-
<uap:FileType>.fds</uap:FileType>
60-
<uap:FileType>.nes</uap:FileType>
61-
<uap:FileType>.unf</uap:FileType>
62-
<uap:FileType>.unif</uap:FileType>
57+
<uap:FileType>.pbp</uap:FileType>
6358
</uap:SupportedFileTypes>
6459
</uap:FileTypeAssociation>
6560
</uap:Extension>
6661
<uap:Extension Category="windows.fileTypeAssociation">
67-
<uap:FileTypeAssociation Name="gbroms">
68-
<uap:DisplayName>ms-resource:GameBoyRomDescription\Text</uap:DisplayName>
62+
<uap:FileTypeAssociation Name="sgroms">
63+
<uap:DisplayName>ms-resource:SG1000RomDescription\Text</uap:DisplayName>
6964
<uap:Logo>Assets\FileIcon.png</uap:Logo>
70-
<uap:InfoTip>ms-resource:GameBoyRomDescription\Text</uap:InfoTip>
65+
<uap:InfoTip>ms-resource:SG1000RomDescription\Text</uap:InfoTip>
7166
<uap:SupportedFileTypes>
72-
<uap:FileType>.gb</uap:FileType>
73-
<uap:FileType>.gbc</uap:FileType>
74-
<uap:FileType>.dmg</uap:FileType>
67+
<uap:FileType>.sg</uap:FileType>
7568
</uap:SupportedFileTypes>
7669
</uap:FileTypeAssociation>
7770
</uap:Extension>
7871
<uap:Extension Category="windows.fileTypeAssociation">
79-
<uap:FileTypeAssociation Name="gbaroms">
80-
<uap:DisplayName>ms-resource:GameBoyAdvanceRomDescription\Text</uap:DisplayName>
72+
<uap:FileTypeAssociation Name="gamegearroms">
73+
<uap:DisplayName>ms-resource:GameGearRomDescription\Text</uap:DisplayName>
8174
<uap:Logo>Assets\FileIcon.png</uap:Logo>
82-
<uap:InfoTip>ms-resource:GameBoyAdvanceRomDescription\Text</uap:InfoTip>
75+
<uap:InfoTip>ms-resource:GameGearRomDescription\Text</uap:InfoTip>
8376
<uap:SupportedFileTypes>
84-
<uap:FileType>.gba</uap:FileType>
77+
<uap:FileType>.gg</uap:FileType>
78+
</uap:SupportedFileTypes>
79+
</uap:FileTypeAssociation>
80+
</uap:Extension>
81+
<uap:Extension Category="windows.fileTypeAssociation">
82+
<uap:FileTypeAssociation Name="mastersystemroms">
83+
<uap:DisplayName>ms-resource:MasterSystemRomDescription\Text</uap:DisplayName>
84+
<uap:Logo>Assets\FileIcon.png</uap:Logo>
85+
<uap:InfoTip>ms-resource:MasterSystemRomDescription\Text</uap:InfoTip>
86+
<uap:SupportedFileTypes>
87+
<uap:FileType>.sms</uap:FileType>
8588
</uap:SupportedFileTypes>
8689
</uap:FileTypeAssociation>
8790
</uap:Extension>
@@ -99,63 +102,60 @@
99102
</uap:FileTypeAssociation>
100103
</uap:Extension>
101104
<uap:Extension Category="windows.fileTypeAssociation">
102-
<uap:FileTypeAssociation Name="mastersystemroms">
103-
<uap:DisplayName>ms-resource:MasterSystemRomDescription\Text</uap:DisplayName>
104-
<uap:Logo>Assets\FileIcon.png</uap:Logo>
105-
<uap:InfoTip>ms-resource:MasterSystemRomDescription\Text</uap:InfoTip>
106-
<uap:SupportedFileTypes>
107-
<uap:FileType>.sms</uap:FileType>
108-
</uap:SupportedFileTypes>
109-
</uap:FileTypeAssociation>
110-
</uap:Extension>
111-
<uap:Extension Category="windows.fileTypeAssociation">
112-
<uap:FileTypeAssociation Name="gamegearroms">
113-
<uap:DisplayName>ms-resource:GameGearRomDescription\Text</uap:DisplayName>
105+
<uap:FileTypeAssociation Name="gbaroms">
106+
<uap:DisplayName>ms-resource:GameBoyAdvanceRomDescription\Text</uap:DisplayName>
114107
<uap:Logo>Assets\FileIcon.png</uap:Logo>
115-
<uap:InfoTip>ms-resource:GameGearRomDescription\Text</uap:InfoTip>
108+
<uap:InfoTip>ms-resource:GameBoyAdvanceRomDescription\Text</uap:InfoTip>
116109
<uap:SupportedFileTypes>
117-
<uap:FileType>.gg</uap:FileType>
110+
<uap:FileType>.gba</uap:FileType>
118111
</uap:SupportedFileTypes>
119112
</uap:FileTypeAssociation>
120113
</uap:Extension>
121114
<uap:Extension Category="windows.fileTypeAssociation">
122-
<uap:FileTypeAssociation Name="sgroms">
123-
<uap:DisplayName>ms-resource:SG1000RomDescription\Text</uap:DisplayName>
115+
<uap:FileTypeAssociation Name="gbroms">
116+
<uap:DisplayName>ms-resource:GameBoyRomDescription\Text</uap:DisplayName>
124117
<uap:Logo>Assets\FileIcon.png</uap:Logo>
125-
<uap:InfoTip>ms-resource:SG1000RomDescription\Text</uap:InfoTip>
118+
<uap:InfoTip>ms-resource:GameBoyRomDescription\Text</uap:InfoTip>
126119
<uap:SupportedFileTypes>
127-
<uap:FileType>.sg</uap:FileType>
120+
<uap:FileType>.gb</uap:FileType>
121+
<uap:FileType>.gbc</uap:FileType>
122+
<uap:FileType>.dmg</uap:FileType>
128123
</uap:SupportedFileTypes>
129124
</uap:FileTypeAssociation>
130125
</uap:Extension>
131126
<uap:Extension Category="windows.fileTypeAssociation">
132-
<uap:FileTypeAssociation Name="ps1roms">
133-
<uap:DisplayName>ms-resource:PlayStationRomDescription\Text</uap:DisplayName>
127+
<uap:FileTypeAssociation Name="nesrom">
128+
<uap:DisplayName>ms-resource:NESRomDescription\Text</uap:DisplayName>
134129
<uap:Logo>Assets\FileIcon.png</uap:Logo>
135-
<uap:InfoTip>ms-resource:PlayStationRomDescription\Text</uap:InfoTip>
130+
<uap:InfoTip>ms-resource:NESRomDescription\Text</uap:InfoTip>
136131
<uap:SupportedFileTypes>
137-
<uap:FileType>.pbp</uap:FileType>
132+
<uap:FileType>.fds</uap:FileType>
133+
<uap:FileType>.nes</uap:FileType>
134+
<uap:FileType>.unf</uap:FileType>
135+
<uap:FileType>.unif</uap:FileType>
138136
</uap:SupportedFileTypes>
139137
</uap:FileTypeAssociation>
140138
</uap:Extension>
141139
<uap:Extension Category="windows.fileTypeAssociation">
142-
<uap:FileTypeAssociation Name="ngproms">
143-
<uap:DisplayName>ms-resource:NeoGeoPocketRomDescription\Text</uap:DisplayName>
140+
<uap:FileTypeAssociation Name="snesroms">
141+
<uap:DisplayName>ms-resource:SNESRomDescription\Text</uap:DisplayName>
144142
<uap:Logo>Assets\FileIcon.png</uap:Logo>
145-
<uap:InfoTip>ms-resource:NeoGeoPocketRomDescription\Text</uap:InfoTip>
143+
<uap:InfoTip>ms-resource:SNESRomDescription\Text</uap:InfoTip>
146144
<uap:SupportedFileTypes>
147-
<uap:FileType>.ngp</uap:FileType>
148-
<uap:FileType>.ngc</uap:FileType>
145+
<uap:FileType>.smc</uap:FileType>
146+
<uap:FileType>.sfc</uap:FileType>
147+
<uap:FileType>.swc</uap:FileType>
148+
<uap:FileType>.fig</uap:FileType>
149149
</uap:SupportedFileTypes>
150150
</uap:FileTypeAssociation>
151151
</uap:Extension>
152152
<uap:Extension Category="windows.fileTypeAssociation">
153-
<uap:FileTypeAssociation Name="pcengineroms">
154-
<uap:DisplayName>ms-resource:PCEngineRomDescription\Text</uap:DisplayName>
153+
<uap:FileTypeAssociation Name="ndsroms">
154+
<uap:DisplayName>ms-resource:DSRomDescription\Text</uap:DisplayName>
155155
<uap:Logo>Assets\FileIcon.png</uap:Logo>
156-
<uap:InfoTip>ms-resource:PCEngineRomDescription\Text</uap:InfoTip>
156+
<uap:InfoTip>ms-resource:DSRomDescription\Text</uap:InfoTip>
157157
<uap:SupportedFileTypes>
158-
<uap:FileType>.pce</uap:FileType>
158+
<uap:FileType>.nds</uap:FileType>
159159
</uap:SupportedFileTypes>
160160
</uap:FileTypeAssociation>
161161
</uap:Extension>

‎RetriX.UWP/RetriX.UWP.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
2424
<AppxBundle>Always</AppxBundle>
2525
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
26+
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
2627
</PropertyGroup>
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2829
<DebugSymbols>true</DebugSymbols>

‎RetriX.UWP/Services/EmulationService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ public EmulationService(IUserDialogs dialogsService, ILocalizationService locali
9292
new ViewModels.GameSystemVM(BeetlePCEFastRT.BeetlePCEFastCore.Instance, LocalizationService, "SystemNamePCEngineCD", "ManufacturerNameNEC", "\uf124", false, new HashSet<string>{ ".cue", ".ccd" }, CDImageExtensions),
9393
new ViewModels.GameSystemVM(BeetlePCFXRT.BeetlePCFXCore.Instance, LocalizationService, "SystemNamePCFX", "ManufacturerNameNEC", "\uf124", false, new HashSet<string>{ ".cue", ".ccd", ".toc" }, CDImageExtensions),
9494
new ViewModels.GameSystemVM(BeetleWswanRT.BeetleWswanCore.Instance, LocalizationService, "SystemNameWonderSwan", "ManufacturerNameBandai", "\uf129"),
95+
new ViewModels.GameSystemVM(FBAlphaRT.FBAlphaCore.Instance, LocalizationService, "SystemNameNeoGeo", "ManufacturerNameSNK", "\uf102", false),
9596
new ViewModels.GameSystemVM(BeetleNGPRT.BeetleNGPCore.Instance, LocalizationService, "SystemNameNeoGeoPocket", "ManufacturerNameSNK", "\uf129"),
96-
new ViewModels.GameSystemVM(FBAlphaRT.FBAlphaCore.Instance, LocalizationService, "SystemNameArcade", "ManufacturerNameFBAlpha", "\uf102"),
97+
new ViewModels.GameSystemVM(FBAlphaRT.FBAlphaCore.Instance, LocalizationService, "SystemNameArcade", "ManufacturerNameFBAlpha", "\uf102", true),
9798
};
9899

99100
var allCores = systems.Select(d => d.Core).Distinct().ToArray();

‎RetriX.UWP/Strings/en-US/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,4 +350,7 @@ Restart RetriX and try again.</value>
350350
<data name="SystemNameArcade" xml:space="preserve">
351351
<value>Arcade</value>
352352
</data>
353+
<data name="SystemNameNeoGeo" xml:space="preserve">
354+
<value>Neo Geo</value>
355+
</data>
353356
</root>

‎readme.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ Libretro core used in parentheses
1818
- Game Gear (Genesis Plus GX)
1919
- Mega Drive (Genesis Plus GX)
2020
- PlayStation (Genesis Plus GX)
21-
- NeoGeo Pocket (BeetleNGP)
21+
- Neo Geo (Final Burn Alpha)
22+
- Neo Geo Pocket (BeetleNGP)
2223
- Wonderswan (BeetleWSwan)
2324
- PC Engine (BeetlePCEFast)
25+
- PC-FX (Beetle PCFX)
2426
- PlayStation (BeetlePSX)
27+
- Arcade (Final Burn Alpha)
2528

2629
## Demo
2730

@@ -69,7 +72,7 @@ The project makes extensive use of [Git submodules](https://git-scm.com/docs/git
6972
## Current state
7073

7174
- Created a framework to speed up porting of software rendering based Libretro cores to WinRT components
72-
- Ported GenesisPlusGX, Snes9x, FCEUMM, Nestopia (doesn't work well, using FCEUMM instead), VBAM, Ganbatte, BeetlePSX and MelonDS
75+
- Ported GenesisPlusGX, Snes9x, FCEUMM, Nestopia (doesn't work well, using FCEUMM instead), VBAM, Ganbatte, BeetlePSX, Beetle PCEFast, Beetle PCFX, Final Burn Alpha, MelonDS
7376
- 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
7477
- 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)
7578
- Created [Win2D/Angle](https://github.com/Microsoft/Win2D) based video renderer. Supports software based Libretro cores.

0 commit comments

Comments
 (0)