ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

/s/_3DS/N3DS

This commit is contained in:
CasualPokePlayer 2023-07-27 22:37:06 -07:00
parent 5607845b24
commit bd2c2ffc86
16 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
View File

@ -16,7 +16,7 @@ using BizHawk.Client.Common.Filters;
using BizHawk.Common.CollectionExtensions;
using BizHawk.Common.PathExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Consoles.Nintendo._3DS;
using BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
using BizHawk.Emulation.Cores.Sony.PSX;

2
src/BizHawk.Client.Common/DisplayManager/Filters/Gui.cs
View File

@ -4,7 +4,7 @@ using System.Drawing;
using BizHawk.Bizware.BizwareGL;
using BizHawk.Client.Common.FilterManager;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Consoles.Nintendo._3DS;
using BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
namespace BizHawk.Client.Common.Filters

2
src/BizHawk.Client.Common/RomGame.cs
View File

@ -57,7 +57,7 @@ namespace BizHawk.Client.Common
GameInfo = new()
{
Name = Path.GetFileNameWithoutExtension(file.Name).Replace('_', ' '),
System = VSystemID.Raw._3DS,
System = VSystemID.Raw.N3DS,
Hash = "N/A",
Status = RomStatus.NotInDatabase,
NotInDatabase = true

6
src/BizHawk.Client.Common/config/PathEntryCollection.cs
View File

@ -64,7 +64,7 @@ namespace BizHawk.Client.Common
[VSystemID.Raw.Sega32X] = "Sega 32X",
[VSystemID.Raw.GGL] = "Dual Game Gear",
[VSystemID.Raw.Satellaview] = "Satellaview",
[VSystemID.Raw._3DS] = "3DS"
[VSystemID.Raw.N3DS] = "3DS"
};
private static PathEntry BaseEntryFor(string sysID, string path)
@ -191,9 +191,9 @@ namespace BizHawk.Client.Common
new(GLOBAL, "Temp Files", ""),
},
CommonEntriesFor(VSystemID.Raw._3DS, basePath: Path.Combine(".", "3DS"), omitSaveRAM: true),
CommonEntriesFor(VSystemID.Raw.N3DS, basePath: Path.Combine(".", "3DS"), omitSaveRAM: true),
new[] {
UserEntryFor(VSystemID.Raw._3DS),
UserEntryFor(VSystemID.Raw.N3DS),
},
CommonEntriesFor(VSystemID.Raw.Sega32X, basePath: Path.Combine(".", "32X")),

2
src/BizHawk.Emulation.Common/Extensions.cs
View File

@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Common
/// <remarks>need to think about e.g. Genesis / Mega Drive using one sysID but having a different display name depending on the BIOS region --yoshi</remarks>
public static readonly IReadOnlyDictionary<string, string> SystemIDDisplayNames = new Dictionary<string, string>
{
[VSystemID.Raw._3DS] = "3DS",
[VSystemID.Raw.A26] = "Atari 2600",
[VSystemID.Raw.A78] = "Atari 7800",
[VSystemID.Raw.AmstradCPC] = "Amstrad CPC",
@ -41,6 +40,7 @@ namespace BizHawk.Emulation.Common
[VSystemID.Raw.Libretro] = "Libretro",
[VSystemID.Raw.Lynx] = "Lynx",
[VSystemID.Raw.MSX] = "MSX",
[VSystemID.Raw.N3DS] = "3DS",
[VSystemID.Raw.N64] = "Nintendo 64",
[VSystemID.Raw.NDS] = "NDS",
[VSystemID.Raw.NES] = "NES",

2
src/BizHawk.Emulation.Common/VSystemID.cs
View File

@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Common
{
public static class Raw
{
public const string _3DS = "3DS";
public const string A26 = "A26";
public const string A78 = "A78";
public const string Amiga = "Amiga";
@ -39,6 +38,7 @@ namespace BizHawk.Emulation.Common
public const string Libretro = "Libretro";
public const string Lynx = "Lynx";
public const string MSX = "MSX";
public const string N3DS = "3DS";
public const string N64 = "N64";
public const string NDS = "NDS";
public const string NeoGeoCD = "NeoGeoCD";

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/3DSMotionEmu.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Numerics;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public class _3DSMotionEmu
{

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IEmulator.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public partial class Citra : IEmulator
{
@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
public int Frame { get; set; }
public string SystemId => VSystemID.Raw._3DS;
public string SystemId => VSystemID.Raw.N3DS;
public bool DeterministicEmulation { get; }

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IInputPollable.cs
View File

@ -3,7 +3,7 @@ using System;
using BizHawk.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public partial class Citra : IInputPollable
{

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IMemoryDomains.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public partial class Citra
{

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISettable.cs
View File

@ -8,7 +8,7 @@ using System.Drawing;
using System.Runtime.InteropServices;
using System.Text;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public partial class Citra : ISettable<Citra.CitraSettings, Citra.CitraSyncSettings>
{

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.ISoundProvider.cs
View File

@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public partial class Citra : ISoundProvider
{

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IStatable.cs
View File

@ -3,7 +3,7 @@ using System.IO;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public partial class Citra : IStatable
{

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.IVideoProvider.cs
View File

@ -2,7 +2,7 @@ using System;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public class CitraVideoProvider : IVideoProvider
{

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Citra.cs
View File

@ -9,7 +9,7 @@ using BizHawk.BizInvoke;
using BizHawk.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
[PortedCore(CoreNames.Citra, "Citra Emulator Project", "nightly-1953", "https://citra-emu.org", singleInstance: true, isReleased: false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })]
@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
public bool TouchScreenRotated { get; private set; }
public bool TouchScreenEnabled { get; private set; }
[CoreConstructor(VSystemID.Raw._3DS)]
[CoreConstructor(VSystemID.Raw.N3DS)]
public Citra(CoreLoadParameters<CitraSettings, CitraSyncSettings> lp)
{
if (lp.Roms.Exists(r => r.RomPath.Contains("|")))

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/LibCitra.cs
View File

@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
using BizHawk.BizInvoke;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo._3DS
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
{
public abstract class LibCitra
{