Skip to content

Commit

Permalink
Release
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClusterM
ClusterM committed Oct 7, 2017
1 parent e27869a commit bfc42b2
Show file tree
Hide file tree
Showing 58 changed files with 1,002 additions and 2,350 deletions.
12 changes: 9 additions & 3 deletions Apps/NesGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public NesGame(string path, bool ignoreEmptyConfig = false)
public static bool Patch(string inputFileName, ref byte[] rawRomData, ref char prefix, ref string application, ref string outputFileName, ref string args, ref Image cover, ref byte saveCount, ref uint crc32)
{
// Try to patch before mapper check, maybe it will patch mapper
FindPatch(ref rawRomData, inputFileName, crc32);

var patched = FindPatch(ref rawRomData, inputFileName, crc32);
NesFile nesFile;
try
{
Expand All @@ -66,8 +65,15 @@ public static bool Patch(string inputFileName, ref byte[] rawRomData, ref char p
application = "/bin/nes";
return true;
}
nesFile.CorrectRom();
crc32 = nesFile.CRC32;
// Also search for patch using internal CRC32
if (!patched)
{
if (FindPatch(ref rawRomData, inputFileName, crc32))
nesFile = new NesFile(rawRomData);
}
nesFile.CorrectRom();

if (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)
{
application = "/bin/clover-kachikachi-wr";
Expand Down
5 changes: 3 additions & 2 deletions Apps/SnesGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ public bool TryAutofill(uint crc32)
if (ReleaseDate.Length == 7) ReleaseDate += "-01";
Publisher = gameinfo.Publisher.ToUpper();

/*
if (!string.IsNullOrEmpty(gameinfo.CoverUrl))
{
if (NeedAutoDownloadCover != true)
Expand All @@ -535,7 +536,7 @@ public bool TryAutofill(uint crc32)
MessageBoxIcon.Question,
MessageBoxDefaultButton.Button2, true);
if (r == DialogResult.Abort)
NeedPatch = true;
NeedAutoDownloadCover = true;
if (r == DialogResult.Ignore)
return true;
}
Expand All @@ -552,7 +553,7 @@ public bool TryAutofill(uint crc32)
Debug.WriteLine(ex.Message + ex.StackTrace);
}
}

*/
return true;
}
return false;
Expand Down
19 changes: 18 additions & 1 deletion FoldersManagerForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,24 @@ namespace com.clusterrr.hakchi_gui
{
public partial class FoldersManagerForm : Form
{
public static string FoldersXmlPath = Path.Combine(Path.Combine(Program.BaseDirectoryExternal, ConfigIni.ConfigDir), "folders.xml");
public static string FoldersXmlPath
{
get
{
switch(ConfigIni.ConsoleType)
{
default:
case MainForm.ConsoleType.NES:
return Path.Combine(Path.Combine(Program.BaseDirectoryExternal, ConfigIni.ConfigDir), "folders.xml");
case MainForm.ConsoleType.Famicom:
return Path.Combine(Path.Combine(Program.BaseDirectoryExternal, ConfigIni.ConfigDir), "folders_famicom.xml");
case MainForm.ConsoleType.SNES:
return Path.Combine(Path.Combine(Program.BaseDirectoryExternal, ConfigIni.ConfigDir), "folders_snes.xml");
case MainForm.ConsoleType.SuperFamicom:
return Path.Combine(Path.Combine(Program.BaseDirectoryExternal, ConfigIni.ConfigDir), "folders_super_famicom.xml");
}
}
}
List<TreeNode> cuttedNodes = new List<TreeNode>();
List<INesMenuElement> deletedGames = new List<INesMenuElement>();
NesMenuCollection gamesCollection = new NesMenuCollection();
Expand Down
6 changes: 3 additions & 3 deletions FoldersManagerForm.nl.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<value>Originele spellen -&gt; Verdeel gelijkmatig</value>
</data>
<data name="buttonFoldersLetters.Text">
<value>Verdeel op de eerste letter</value>
<value>Verdeel op eerste letter</value>
</data>
<data name="buttonFoldersLettersOriginal.Text">
<value>Originele spellen -&gt; Verdeel vanaf de eerste letter</value>
Expand All @@ -95,10 +95,10 @@
<value>Menu icoon</value>
</data>
<data name="groupBoxSplitModes.Text">
<value>Creëer de mappen structuur automatisch</value>
<value>Creëer mappen structuur automatisch</value>
</data>
<data name="labelPosition.Text">
<value>Prioriteit van de mappen positie:</value>
<value>Prioriteit van mappen positie:</value>
</data>
<data name="newFolderToolStripMenuItem.Text">
<value>Creëer een nieuwe map</value>
Expand Down
6 changes: 3 additions & 3 deletions GameGenieCodeForm.nl.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@
<value>Game Genie code lijst</value>
</data>
<data name="addToolStripMenuItem.Text">
<value>Voeg toe</value>
<value>Toevoegen</value>
</data>
<data name="buttonAdd.Text">
<value>Voeg toe</value>
<value>Toevoegen</value>
</data>
<data name="buttonCancel.Text">
<value>Annuleren</value>
</data>
<data name="buttonImport.Text">
<value>Importeer</value>
<value>Importeren</value>
</data>
<data name="editToolStripMenuItem.Text">
<value>Bewerken</value>
Expand Down
2 changes: 1 addition & 1 deletion ImageGooglerForm.nl.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="$this.Text">
<value>Google afbeeldingen</value>
<value>Google Afbeeldingen</value>
</data>
</root>
92 changes: 46 additions & 46 deletions MainForm.de-DE.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<value>Original Spiele in Root -&gt; automatisch in Unterordner</value>
</data>
<data name="automaticToolStripMenuItem.Text">
<value>Automatich</value>
<value>Automatisch</value>
</data>
<data name="buttonAddGames.Text">
<value>Mehr Spiele hinzufügen</value>
Expand All @@ -85,38 +85,65 @@
<data name="buttonStart.Text">
<value>Synchronisiere gewählte Spiele mit NES/SNES Mini</value>
</data>
<data name="checkBoxCompressed.Text">
<value>Komprimieren</value>
</data>
<data name="cloverconHackToolStripMenuItem.Text">
<value>Controller Hacks</value>
</data>
<data name="compressGamesIfPossibleToolStripMenuItem.Text">
<value>Komprimiere nicht-NES Spiele (für zusätzliche Emulatoren)</value>
</data>
<data name="compressGamesToolStripMenuItem.Text">
<value>Spiele beim Hinzufügen komprimieren</value>
</data>
<data name="compressSelectedGamesToolStripMenuItem.Text">
<value>Ausgewählte Spiele komprimieren</value>
</data>
<data name="consoleTypeToolStripMenuItem.Text">
<value>Konsolentyp</value>
</data>
<data name="customToolStripMenuItem.Text">
<value>Benutzerdefiniert - Ordner Manager jedes mal anzeigen</value>
</data>
<data name="decompressSelectedGamesToolStripMenuItem.Text">
<value>Ausgewählte Spiele entpacken</value>
</data>
<data name="deleteGameToolStripMenuItem.Text">
<value>Spiel löschen</value>
</data>
<data name="deletePresetToolStripMenuItem.Text">
<value>Preset löschen</value>
</data>
<data name="deleteSelectedGamesToolStripMenuItem.Text">
<value>Ausgewählte Spiele löschen</value>
</data>
<data name="disablePagefoldersToolStripMenuItem.Text">
<value>Seiten/Ordner deaktivieren</value>
</data>
<data name="donateToolStripMenuItem.Text">
<value>Projekt unterstützen</value>
</data>
<data name="downloadBoxArtForSelectedGamesToolStripMenuItem.Text">
<value>Spielecovers herunterladen</value>
</data>
<data name="downloadCoversForAllGamesToolStripMenuItem.Text">
<value>Lade Covers für alle Spiele</value>
</data>
<data name="dumpKernelToolStripMenuItem.Text">
<value>Kernel sichern</value>
</data>
<data name="dumpNANDBToolStripMenuItem.Text">
<value>Verschlüsselten NAND-B Bereich lesen</value>
</data>
<data name="dumpTheWholeNANDToolStripMenuItem.Text">
<value>Die ganze NAND-Speicher auslesen.</value>
</data>
<data name="enableAutofireToolStripMenuItem.Text">
<value>Benutze "Select+A/B", um Autofeuer für A/B zu aktivieren</value>
</data>
<data name="epilepsyProtectionToolStripMenuItem.Text">
<value>Epilepsie-Schutz deaktivieren</value>
<value>Epilepsieschutz deaktivieren</value>
</data>
<data name="exitToolStripMenuItem.Text">
<value>&amp;Beenden</value>
Expand Down Expand Up @@ -190,12 +217,21 @@
<data name="labelName.Text">
<value>Name:</value>
</data>
<data name="labelSize.Text">
<value>Größe:</value>
</data>
<data name="languageToolStripMenuItem.Text">
<value>Sprache</value>
</data>
<data name="maximumGamesPerFolderToolStripMenuItem.Text">
<value>Maximal Spiele pro Seite/Ordner</value>
</data>
<data name="membootOriginalKernelToolStripMenuItem.Text">
<value>Den Originalkernel von RAM laden</value>
</data>
<data name="membootPatchedKernelToolStripMenuItem.Text">
<value>Den modifizierten Kernel von RAM laden</value>
</data>
<data name="modulesToolStripMenuItem.Text">
<value>&amp;Module</value>
</data>
Expand Down Expand Up @@ -235,6 +271,9 @@
<data name="resetUsingCombinationOfButtonsToolStripMenuItem.Text">
<value>Benutze Tastenkombination für Zurücksetzen</value>
</data>
<data name="saveDumpFileDialog.Title">
<value>Wo soll der gesicherte Dump gespeichert werden</value>
</data>
<data name="saveSettingsToNESMiniNowToolStripMenuItem.Text">
<value>Einstellungen in NES/SNES Mini jetzt speichern</value>
</data>
Expand All @@ -248,7 +287,7 @@
<value>Alle Auswählen</value>
</data>
<data name="selectButtonCombinationToolStripMenuItem.Text">
<value>Wähle Kombination, um ins Menu zu gehen</value>
<value>Wähle Kombination, um ins Menü zu gehen</value>
</data>
<data name="settingsToolStripMenuItem.Text">
<value>&amp;Einstellungen</value>
Expand All @@ -260,7 +299,10 @@
<value>Synchronisieren</value>
</data>
<data name="takeScreenshotToolStripMenuItem.Text">
<value>Einen screenshot machen</value>
<value>Einen Screenshot machen</value>
</data>
<data name="toolFlashTheWholeNANDStripMenuItem.Text">
<value>Die ganze NAND flashen (nur für Experten!)</value>
</data>
<data name="toolsToolStripMenuItem.Text">
<value>&amp;Extras</value>
Expand All @@ -283,46 +325,4 @@
<data name="useXYOnClassicControllerAsAutofireABToolStripMenuItem.Text">
<value>Nutze X/Y auf dem Classic Controller als Autofeuer A/B</value>
</data>
<data name="checkBoxCompressed.Text">
<value>Compress</value>
</data>
<data name="compressGamesToolStripMenuItem.Text">
<value>Compress games when adding</value>
</data>
<data name="compressSelectedGamesToolStripMenuItem.Text">
<value>Compress selected games</value>
</data>
<data name="decompressSelectedGamesToolStripMenuItem.Text">
<value>Decompress selected games</value>
</data>
<data name="deleteSelectedGamesToolStripMenuItem.Text">
<value>Delete selected games</value>
</data>
<data name="donateToolStripMenuItem.Text">
<value>Donate</value>
</data>
<data name="downloadBoxArtForSelectedGamesToolStripMenuItem.Text">
<value>Download box art for selected games</value>
</data>
<data name="dumpNANDBToolStripMenuItem.Text">
<value>Dump decrypted NAND-B partition</value>
</data>
<data name="dumpTheWholeNANDToolStripMenuItem.Text">
<value>Dump the whole NAND flash</value>
</data>
<data name="labelSize.Text">
<value>Size:</value>
</data>
<data name="membootOriginalKernelToolStripMenuItem.Text">
<value>Boot original kernel from RAM</value>
</data>
<data name="membootPatchedKernelToolStripMenuItem.Text">
<value>Boot patched kernel from RAM</value>
</data>
<data name="saveDumpFileDialog.Title">
<value>Select dump filename</value>
</data>
<data name="toolFlashTheWholeNANDStripMenuItem.Text">
<value>Flash the whole NAND (experts only!)</value>
</data>
</root>
6 changes: 3 additions & 3 deletions MainForm.en-GB.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<value>Browse</value>
</data>
<data name="buttonStart.Text">
<value>Synchronise selected games with NES/SNES Mini</value>
<value>Synchronise selected games with S/NES Mini</value>
</data>
<data name="checkBoxCompressed.Text">
<value>Compress</value>
Expand Down Expand Up @@ -128,7 +128,7 @@
<value>Download box art for selected games</value>
</data>
<data name="downloadCoversForAllGamesToolStripMenuItem.Text">
<value>Download box art for all games (I'm feeling lucky!)</value>
<value>Download box art for all games</value>
</data>
<data name="dumpKernelToolStripMenuItem.Text">
<value>Dump kernel</value>
Expand Down Expand Up @@ -275,7 +275,7 @@
<value>Select dump filename</value>
</data>
<data name="saveSettingsToNESMiniNowToolStripMenuItem.Text">
<value>Save settings to NES/SNES Mini</value>
<value>Save settings to S/NES Mini</value>
</data>
<data name="saveStateManagerToolStripMenuItem.Text">
<value>Savestate Manager</value>
Expand Down
Loading

0 comments on commit bfc42b2

Please sign in to comment.