Beta v0.25

CatmanFan · Jun 22, 2023 · ea03a98 · ea03a98
1 parent fa2dcdb
commit ea03a98
Show file tree

Hide file tree

Showing 11 changed files with 521 additions and 1,426 deletions.
diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj
@@ -214,8 +214,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="libWiiSharp.dll" />
+    <None Include="Resources\forwarders\COMX.wad" />
     <None Include="Resources\forwarders\forwarder_v12.dol" />
     <None Include="Resources\forwarders\forwarder_v14.dol" />
+    <None Include="Resources\forwarders\WNKO.wad" />
     <None Include="Resources\wwcxtool.exe" />
     <None Include="Resources\lzh8_cmp.exe" />
     <None Include="Resources\lzh8_cmp_nonstrict.exe" />

diff --git a/FriishProduce/Properties/Resources.Designer.cs b/FriishProduce/Properties/Resources.Designer.cs
diff --git a/FriishProduce/Properties/Resources.resx b/FriishProduce/Properties/Resources.resx
@@ -175,4 +175,10 @@
   <data name="Forwarder_v14" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\forwarders\forwarder_v14.dol;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Forwarder_COMX" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\forwarders\COMX.wad;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Forwarder_WNKO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\forwarders\WNKO.wad;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/FriishProduce/Resources/forwarders/COMX.wad b/FriishProduce/Resources/forwarders/COMX.wad
diff --git a/FriishProduce/Resources/forwarders/WNKO.wad b/FriishProduce/Resources/forwarders/WNKO.wad
diff --git a/FriishProduce/_classes/injectors/forwarders.cs b/FriishProduce/_classes/injectors/forwarders.cs
@@ -17,7 +17,7 @@ public class Generic
             "Snes9x TX",
             "Visual Boy Advance GX",
             "Genesis Plus GX",
-            "Wii64 (glN64 GFX)",
+            "Wii64 (GLideN64 GFX)",
             "Wii64 (Rice GFX)",
             "Not64",
             "Mupen64GC-FIX94",
@@ -142,7 +142,7 @@ public void ConvertWAD(int type, string tid, bool vWii = false)
 
             var forwarderTarget = COMX ? "00000002.app"                             : "00000001.app";
             var NANDloader      = COMX ? "00000001.app"                             : "00000002.app";
-            var x               = COMX ? WAD.Load(Paths.Database + "dol\\COMX.wad") : WAD.Load(Paths.Database + "dol\\WNKO.wad");
+            var x               = COMX ? WAD.Load(Properties.Resources.Forwarder_COMX) : WAD.Load(Properties.Resources.Forwarder_WNKO);
             x.Unpack(Paths.WorkingFolder_Forwarder);
             x.Dispose();
 

diff --git a/FriishProduce/langs/en.json b/FriishProduce/langs/en.json
@@ -20,14 +20,6 @@
     "S32X": "SEGA/MEGA 32X",
     "PSX": "PlayStation"
   },
-  "methods": {
-    "VC": "Virtual Console",
-    "FCEUGX": "FCE Ultra GX",
-    "Snes9XGX": "Snes9x GX",
-    "VBAGX": "VBA GX",
-    "RA-SS": "RetroArch-SS",
-    "vWii": "vWii compatible",
-  },
   "global": {
     "g000": "FriishProduce",
     "g001": "Settings",
@@ -42,6 +34,7 @@
     "g010": "Modify emulator configuration",
     "g011": "Emulator configuration",
     "g012": "Virtual Console",
+    "vWii": "vWii compatibility",
     "OK": "&OK",
     "Cancel": "&Cancel",
     "Yes": "&Yes",

diff --git a/FriishProduce/langs/es.json b/FriishProduce/langs/es.json
@@ -10,10 +10,6 @@
     "N64": "Nintendo 64",
     "NeoGeo": "SNK Neo-Geo",
   },
-  "methods": {
-    "VC": "Consola Virtual",
-    "vWii": "Compatible con vWii",
-  },
   "global": {
     "g000": "FriishProduce",
     "g001": "Configuración",
@@ -28,13 +24,14 @@
     "g010": "Modificar la configuración del emulador",
     "g011": "Configuración del emulador",
     "g012": "Consola Virtual",
+    "vWii": "Compatible con vWii",
     "OK": "&Aceptar",
     "Cancel": "&Cancelar",
     "Yes": "&Sí",
     "No": "&No",
     "Back": "< &Atrás",
     "Next": "&Siguiente >",
-    "Save": "&Guardar"
+    "Save": "&Guardar",
   },
   "settings": {
     "s000": "Programa",

diff --git a/FriishProduce/langs/fr.json b/FriishProduce/langs/fr.json
@@ -4,6 +4,17 @@
     "name": "Français",
     "author": "CatmanFan"
   },
+  "consoles": {
+    "NES": "NES / Famicom",
+    "SNES": "SNES / Super Famicom",
+    "SMS": "Sega Master System",
+    "SMD": "Sega Mega Drive / Genesis",
+    "SMCD": "Sega Mega CD / Sega CD",
+    "PCE": "PC Engine / TurboGrafx-16",
+    "PCECD": "PC Engine CD / TurboGrafx-16 CD",
+    "NeoGeo": "SNK Neo-Geo",
+    "MSX": "MSX / MSX2",
+  },
   "global": {
     "g000": "FriishProduce",
     "g001": "Réglages",
@@ -18,6 +29,7 @@
     "g010": "Modifier la configuration de l'émulateur",
     "g011": "Émulateur",
     "g012": "Console virtuelle",
+    "vWii": "Compatible avec le vWii (Wii U)",
     "OK": "&OK",
     "Cancel": "&Annuler",
     "Yes": "&Oui",
@@ -26,23 +38,12 @@
     "Next": "&Suivant >",
     "Save": "&Enregistrer"
   },
-  "consoles": {
-    "NES": "NES / Famicom",
-    "SNES": "SNES / Super Famicom",
-    "SMS": "Sega Master System",
-    "SMD": "Sega Mega Drive / Genesis",
-    "SMCD": "Sega Mega CD / Sega CD",
-    "PCE": "PC Engine / TurboGrafx-16",
-    "PCECD": "PC Engine CD / TurboGrafx-16 CD",
-    "NeoGeo": "SNK Neo-Geo",
-    "MSX": "MSX / MSX2",
-  },
   "settings": {
     "s000": "Logiciel",
     "s001": "Langue :",
     "s002": "Système",
     "s003": "Thème :",
-    "s004": "Ouvrir le dossier de sortie lorsque l'exportation est terminée",
+    "s004": "Ouvrir le dossier de sortie à la fin de l'exportation",
     "Theme__l0": "Noir classique",
     "Theme__l1": "Blanc classique"
   },

diff --git a/FriishProduce/main.Designer.cs b/FriishProduce/main.Designer.cs