Fixes

5 files changed, 32 insertions, 16 deletions

diff --git a/Apps/AppTypeCollection.cs b/Apps/AppTypeCollection.cs
index a43ee78e..1ad25fab 100644
--- a/Apps/AppTypeCollection.cs
+++ b/Apps/AppTypeCollection.cs
@@ -27,7 +27,7 @@ namespace com.clusterrr.hakchi_gui
             {

                 Class = typeof(NesGame),

                 Extensions = new string[] {".nes"},

-                DefaultApps = new string[] {"/bin/clover-kachikachi-wr", "/bin/clover-kachikachi", "/bin/nes"},

+                DefaultApps = new string[] { "/bin/nes", "/bin/clover-kachikachi-wr", "/usr/bin/clover-kachikachi" },

                 Prefix = 'H',

                 DefaultCover = Resources.blank_nes

             },

@@ -43,7 +43,7 @@ namespace com.clusterrr.hakchi_gui
             {

                 Class = typeof(FdsGame),

                 Extensions = new string[] {".fds"},

-                DefaultApps = new string[] {"/bin/clover-kachikachi-wr", "/bin/clover-kachikachi",  "/bin/nes"},

+                DefaultApps = new string[] { "/bin/nes", "/bin/clover-kachikachi-wr", "/usr/bin/clover-kachikachi" },

                 Prefix = 'D',

                 DefaultCover = Resources.blank_fds

             },

@@ -51,7 +51,7 @@ namespace com.clusterrr.hakchi_gui
             {

                 Class = typeof(SnesGame),

                 Extensions = new string[] { ".sfc", ".smc", ".sfrom" },

-                DefaultApps = new string[] {"/usr/bin/clover-canoe-shvc", "/bin/snes"},

+                DefaultApps = new string[] { "/bin/snes", "/usr/bin/clover-canoe-shvc", },

                 Prefix = 'U',

                 DefaultCover = Resources.blank_snes_us

             },

diff --git a/Apps/FdsGame.cs b/Apps/FdsGame.cs
index f5072215..271391b1 100644
--- a/Apps/FdsGame.cs
+++ b/Apps/FdsGame.cs
@@ -37,7 +37,9 @@ namespace com.clusterrr.hakchi_gui
                 crc32 = CRC32(rawRomData);

                 // Try to find patch again, using new CRC

                 FindPatch(ref rawRomData, inputFileName,  crc32);

-            }            

+            }

+            if (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)

+                application = "/bin/clover-kachikachi-wr";

             args = DefaultArgs;

             return true;

         }

diff --git a/Apps/NesGame.cs b/Apps/NesGame.cs
index 66dc86a7..eb9e699c 100644
--- a/Apps/NesGame.cs
+++ b/Apps/NesGame.cs
@@ -68,7 +68,9 @@ namespace com.clusterrr.hakchi_gui
             }

             nesFile.CorrectRom();

             crc32 = nesFile.CRC32;

-            if (ConfigIni.ConsoleType != MainForm.ConsoleType.NES && ConfigIni.ConsoleType != MainForm.ConsoleType.Famicom)

+            if (ConfigIni.ConsoleType == MainForm.ConsoleType.NES || ConfigIni.ConsoleType == MainForm.ConsoleType.Famicom)

+                application = "/bin/clover-kachikachi-wr";

+            else

                 application = "/bin/nes";

 

             //if (nesFile.Mapper == 71) nesFile.Mapper = 2; // games by Codemasters/Camerica - this is UNROM clone. One exception - Fire Hawk

diff --git a/MainForm.resx b/MainForm.resx
index 40ade027..14b38805 100644
--- a/MainForm.resx
+++ b/MainForm.resx
@@ -714,7 +714,7 @@
     <value>NoControl</value>

   </data>

   <data name="labelSize.Location" type="System.Drawing.Point, System.Drawing">

-    <value>16, 73</value>

+    <value>15, 73</value>

   </data>

   <data name="labelSize.Size" type="System.Drawing.Size, System.Drawing">

     <value>30, 13</value>

@@ -741,7 +741,7 @@
     <value>True</value>

   </data>

   <data name="checkBoxCompressed.Location" type="System.Drawing.Point, System.Drawing">

-    <value>103, 71</value>

+    <value>103, 72</value>

   </data>

   <data name="checkBoxCompressed.Size" type="System.Drawing.Size, System.Drawing">

     <value>84, 17</value>

@@ -768,7 +768,7 @@
     <value>1</value>

   </data>

   <data name="buttonShowGameGenieDatabase.Location" type="System.Drawing.Point, System.Drawing">

-    <value>252, 288</value>

+    <value>252, 289</value>

   </data>

   <data name="buttonShowGameGenieDatabase.Size" type="System.Drawing.Size, System.Drawing">

     <value>25, 20</value>

@@ -843,7 +843,7 @@
     <value>4</value>

   </data>

   <data name="textBoxGameGenie.Location" type="System.Drawing.Point, System.Drawing">

-    <value>19, 288</value>

+    <value>18, 289</value>

   </data>

   <data name="textBoxGameGenie.Size" type="System.Drawing.Size, System.Drawing">

     <value>227, 20</value>

@@ -870,7 +870,7 @@
     <value>NoControl</value>

   </data>

   <data name="label7.Location" type="System.Drawing.Point, System.Drawing">

-    <value>16, 271</value>

+    <value>15, 272</value>

   </data>

   <data name="label7.Size" type="System.Drawing.Size, System.Drawing">

     <value>194, 13</value>

@@ -927,7 +927,7 @@
     <value>NoControl</value>

   </data>

   <data name="radioButtonTwoSim.Location" type="System.Drawing.Point, System.Drawing">

-    <value>103, 137</value>

+    <value>103, 135</value>

   </data>

   <data name="radioButtonTwoSim.Size" type="System.Drawing.Size, System.Drawing">

     <value>156, 17</value>

@@ -1050,7 +1050,7 @@
     <value>12</value>

   </data>

   <data name="textBoxArguments.Location" type="System.Drawing.Point, System.Drawing">

-    <value>18, 244</value>

+    <value>18, 245</value>

   </data>

   <data name="textBoxArguments.Size" type="System.Drawing.Size, System.Drawing">

     <value>257, 20</value>

@@ -1074,7 +1074,7 @@
     <value>True</value>

   </data>

   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">

-    <value>15, 227</value>

+    <value>15, 228</value>

   </data>

   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">

     <value>201, 13</value>

@@ -1098,7 +1098,7 @@
     <value>14</value>

   </data>

   <data name="textBoxPublisher.Location" type="System.Drawing.Point, System.Drawing">

-    <value>71, 196</value>

+    <value>71, 195</value>

   </data>

   <data name="textBoxPublisher.Size" type="System.Drawing.Size, System.Drawing">

     <value>204, 20</value>

@@ -1122,7 +1122,7 @@
     <value>True</value>

   </data>

   <data name="label2.Location" type="System.Drawing.Point, System.Drawing">

-    <value>15, 199</value>

+    <value>15, 198</value>

   </data>

   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">

     <value>53, 13</value>

@@ -1176,7 +1176,7 @@
     <value>True</value>

   </data>

   <data name="radioButtonOne.Location" type="System.Drawing.Point, System.Drawing">

-    <value>103, 95</value>

+    <value>103, 97</value>

   </data>

   <data name="radioButtonOne.Size" type="System.Drawing.Size, System.Drawing">

     <value>76, 17</value>

diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj
index 031e6e58..7a170cb8 100644
--- a/hakchi_gui.csproj
+++ b/hakchi_gui.csproj
@@ -1558,6 +1558,18 @@
     <Content Include="mods\mod_hakchi\bin\rsync">

       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

+    <Content Include="mods\mod_hakchi\hakchi\rootfs\bin\clover-canoe-shvc-wr">

+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>

+    </Content>

+    <Content Include="mods\mod_hakchi\hakchi\rootfs\bin\mcp-restarter">

+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>

+    </Content>

+    <Content Include="mods\mod_hakchi\hakchi\rootfs\etc\init.d\S82mcp-restarter">

+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>

+    </Content>

+    <Content Include="mods\hmods\tiny7zx-dynamic.hmod">

+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>

+    </Content>

     <None Include="Properties\app.manifest" />

   </ItemGroup>

   <ItemGroup>