Skip to content

Commit

Permalink
Seems like release
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClusterM
ClusterM committed Jan 25, 2017
1 parent d8b5d4f commit 4e46e28
Show file tree
Hide file tree
Showing 14 changed files with 2,356 additions and 2,231 deletions.
2 changes: 1 addition & 1 deletion ConfigIni.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ConfigIni
public static bool DisableMusic = false;
public static byte AntiArmetLevel = 0;
public static byte ConsoleType = 0;
public static byte MaxGamesPerFolder = 35;
public static byte MaxGamesPerFolder = 30;
public static SelectButtonsForm.NesButtons ResetCombination = SelectButtonsForm.NesButtons.Down | SelectButtonsForm.NesButtons.Select;
public static Dictionary<string, string> Presets = new Dictionary<string, string>();
public static string ExtraCommandLineArguments = "";
Expand Down
4 changes: 4 additions & 0 deletions FelLib/Fel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,18 @@ public void Close()

private void WriteToUSB(byte[] buffer)
{
#if DEBUG
Debug.WriteLine("-> " + BitConverter.ToString(buffer));
#endif
device.Pipes[outEndp].Write(buffer);
}

private int ReadFromUSB(byte[] buffer, int offset, int length)
{
var data = device.Pipes[inEndp].Read(buffer, offset, length);
#if DEBUG
Debug.WriteLine("<- " + BitConverter.ToString(buffer));
#endif
return data;
}
private byte[] ReadFromUSB(UInt32 length)
Expand Down
137 changes: 82 additions & 55 deletions MainForm.Designer.cs
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,12 @@ public MainForm()
famicomMiniToolStripMenuItem.Checked = ConfigIni.ConsoleType == 1;
upABStartOnSecondControllerToolStripMenuItem.Checked = ConfigIni.FcStart;
disableMenuMusicToolStripMenuItem.Checked = ConfigIni.DisableMusic;
max20toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 20;
max25toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 25;
max30toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 30;
max35toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 35;
max40toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 40;
max45toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 45;
max50toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 50;
max60toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 60;
max70toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 70;
Expand Down Expand Up @@ -1009,9 +1012,12 @@ private void MainForm_KeyDown(object sender, KeyEventArgs e)
private void toolStripMenuMaxGamesPerFolder_Click(object sender, EventArgs e)
{
ConfigIni.MaxGamesPerFolder = byte.Parse((sender as ToolStripMenuItem).Text);
max20toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 20;
max25toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 25;
max30toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 30;
max35toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 35;
max40toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 40;
max45toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 45;
max50toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 50;
max60toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 60;
max70toolStripMenuItem.Checked = ConfigIni.MaxGamesPerFolder == 70;
Expand Down
4,183 changes: 2,099 additions & 2,084 deletions MainForm.resx
View file

Large diffs are not rendered by default.

127 changes: 80 additions & 47 deletions MainForm.ru-RU.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,42 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Файл</value>
</data>
<data name="kernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="kernelToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Ядро</value>
</data>
<data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 20</value>
</data>
<data name="settingsToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Настройки</value>
</data>
<data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>68, 20</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Помощь</value>
</data>
<data name="addMoreGamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>241, 22</value>
</data>
<data name="addMoreGamesToolStripMenuItem.Text" xml:space="preserve">
<value>Добавить &amp;игр</value>
</data>
<data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>241, 22</value>
</data>
<data name="presetsToolStripMenuItem.Text" xml:space="preserve">
<value>Пресеты</value>
</data>
<data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
<value>163, 6</value>
</data>
Expand All @@ -139,12 +169,6 @@
<data name="deletePresetToolStripMenuItem.Text" xml:space="preserve">
<value>Удалить пресет</value>
</data>
<data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>241, 22</value>
</data>
<data name="presetsToolStripMenuItem.Text" xml:space="preserve">
<value>Пресеты</value>
</data>
<data name="searchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>241, 22</value>
</data>
Expand All @@ -166,12 +190,6 @@
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Выйти</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Файл</value>
</data>
<data name="dumpKernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>270, 22</value>
</data>
Expand All @@ -196,18 +214,18 @@
<data name="uninstallToolStripMenuItem.Text" xml:space="preserve">
<value>Полностью удалиться с NES Mini</value>
</data>
<data name="kernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="kernelToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Ядро</value>
</data>
<data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
<data name="consoleTypeToolStripMenuItem.Text" xml:space="preserve">
<value>Тип консоли</value>
</data>
<data name="epilepsyProtectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
<data name="epilepsyProtectionToolStripMenuItem.Text" xml:space="preserve">
<value>Защита от приступов эпилепсии</value>
</data>
<data name="ToolStripMenuItemArmetLevel0.Size" type="System.Drawing.Size, System.Drawing">
<value>263, 22</value>
</data>
Expand All @@ -226,11 +244,11 @@
<data name="ToolStripMenuItemArmetLevel2.Text" xml:space="preserve">
<value>Отключить для всех игр</value>
</data>
<data name="epilepsyProtectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
<data name="epilepsyProtectionToolStripMenuItem.Text" xml:space="preserve">
<value>Защита от приступов эпилепсии</value>
<data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">
<value>Хаки контроллера</value>
</data>
<data name="resetUsingCombinationOfButtonsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>378, 22</value>
Expand All @@ -256,11 +274,11 @@
<data name="upABStartOnSecondControllerToolStripMenuItem.Text" xml:space="preserve">
<value>"Up+A+B = Start" на втором контроллере</value>
</data>
<data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<data name="guiHacksToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
<data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">
<value>Хаки контроллера</value>
<data name="guiHacksToolStripMenuItem.Text" xml:space="preserve">
<value>Хаки интерфейса</value>
</data>
<data name="useExtendedFontToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>276, 22</value>
Expand All @@ -280,18 +298,42 @@
<data name="disableMenuMusicToolStripMenuItem.Text" xml:space="preserve">
<value>Выключить фоновую музыку</value>
</data>
<data name="guiHacksToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
<data name="guiHacksToolStripMenuItem.Text" xml:space="preserve">
<value>Хаки интерфейса</value>
</data>
<data name="maximumGamesPerFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
<data name="maximumGamesPerFolderToolStripMenuItem.Text" xml:space="preserve">
<value>Максимум игр на страницу</value>
</data>
<data name="max20toolStripMenuItem.Text" xml:space="preserve">
<value>20</value>
</data>
<data name="max25toolStripMenuItem.Text" xml:space="preserve">
<value>25</value>
</data>
<data name="max30toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max35toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max40toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max50toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max60toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max70toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max80toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="max90toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="betterPNGCompressionlowerQualityToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 22</value>
</data>
Expand All @@ -304,12 +346,6 @@
<data name="globalCommandLineArgumentsexpertsOnluToolStripMenuItem.Text" xml:space="preserve">
<value>Глобальные параметры командной строки</value>
</data>
<data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 20</value>
</data>
<data name="settingsToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Настройки</value>
</data>
<data name="gitHubPageWithActualReleasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>263, 22</value>
</data>
Expand All @@ -325,11 +361,8 @@
<data name="aboutToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;О программе...</value>
</data>
<data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>68, 20</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Помощь</value>
<data name="groupBoxOptions.Text" xml:space="preserve">
<value>Параметры игры</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
Expand Down Expand Up @@ -443,9 +476,6 @@
<data name="labelID.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="groupBoxOptions.Text" xml:space="preserve">
<value>Параметры игры</value>
</data>
<data name="label5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
Expand Down Expand Up @@ -473,6 +503,9 @@
<data name="openFileDialogNes.Title" xml:space="preserve">
<value>Выберите NES файл(ы)</value>
</data>
<data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>196, 70</value>
</data>
<data name="selectAllToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>195, 22</value>
</data>
Expand All @@ -491,9 +524,6 @@
<data name="deleteGameToolStripMenuItem.Text" xml:space="preserve">
<value>Удалить игру</value>
</data>
<data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>196, 70</value>
</data>
<data name="buttonStart.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
Expand All @@ -503,6 +533,9 @@
<data name="groupBoxDefaultGames.Text" xml:space="preserve">
<value>Тут можно скрыть некоторые встроенные игры</value>
</data>
<data name="max45toolStripMenuItem.Text" xml:space="preserve">
<value>45</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAABABILAAASCwAAAAAAAAAA
Expand Down
6 changes: 3 additions & 3 deletions NesGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public string Name
public const string GameGenieFileName = "gamegenie.txt";

// TODO: Need more mapper tests.
private byte[] supportedMappers = new byte[] { 0, 1, 2, 3, 4, 5, 7, 9, 10, 87 };
private byte[] supportedMappers = new byte[] { 0, 1, 2, 3, 4, 5, 7, 9, 10, 86, 87, 184 };

public NesGame(string path)
{
Expand Down Expand Up @@ -162,9 +162,9 @@ public NesGame(string gamesDirectory, string nesFileName, bool ignoreMapper, ref
}

if (nesFile.Mapper == 71) nesFile.Mapper = 2; // games by Codemasters/Camerica - this is UNROM clone. One exception - Fire Hawk
if (nesFile.Mapper == 206) nesFile.Mapper = 4; // Compatible with MMC3
if (nesFile.Mapper == 88) nesFile.Mapper = 4; // Compatible with MMC3
if (nesFile.Mapper == 88) nesFile.Mapper = 4; // Compatible with MMC3... sometimes
if (nesFile.Mapper == 95) nesFile.Mapper = 4; // Compatible with MMC3
if (nesFile.Mapper == 206) nesFile.Mapper = 4; // Compatible with MMC3
if (!supportedMappers.Contains(nesFile.Mapper) && !ignoreMapper)
{
Directory.Delete(GamePath, true);
Expand Down
Loading

0 comments on commit 4e46e28

Please sign in to comment.