Fix MSX & add Flash (beta)

CatmanFan · Mar 12, 2024 · 365fd1c · 365fd1c
1 parent 10ce197
commit 365fd1c
Show file tree

Hide file tree

Showing 17 changed files with 514 additions and 764 deletions.
diff --git a/FriishProduce/Database.xml b/FriishProduce/Database.xml
@@ -508,13 +508,6 @@
 			<emuVersion>0</emuVersion>
 		</Entry>
 
-		<Entry>
-			<tid>XAFJ</tid>
-			<name>Metal Gear</name>
-			<displayName>メタルギア</displayName>
-			<emuVersion>1</emuVersion>
-		</Entry>
-
 		<Entry>
 			<tid>XAPJ</tid>
 			<name>Metal Gear 2 - Solid Snake</name>

diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj
@@ -148,7 +148,9 @@
     <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="_classes\Injectors\Flash.cs" />
     <Compile Include="_classes\Injectors\Forwarder.cs" />
+    <Compile Include="_classes\ROM\Flash.cs" />
     <Compile Include="_classes\Injectors\WiiVC\MSX.cs" />
     <Compile Include="_classes\Language.cs" />
     <Compile Include="_classes\ROM\MSX.cs" />

diff --git a/FriishProduce/InjectorForm.cs b/FriishProduce/InjectorForm.cs
@@ -203,6 +203,8 @@ private void Form_Shown(object sender, EventArgs e)
                 default:
                 case Console.Flash:
                     TIDCode = null;
+                    ROM = new SWF();
+                    ImportPatch.Enabled = false;
                     break;
             }
 
@@ -253,7 +255,7 @@ protected virtual void CheckExport()
 
         public bool[] CheckToolStripButtons() => new bool[]
             {
-                Console != Console.NeoGeo && Console != Console.Flash && ROM?.Bytes != null, // LibRetro
+                Console != Console.Flash && (ROM?.Bytes != null || !string.IsNullOrWhiteSpace(ROM?.Path)), // LibRetro
                 Console != Console.Flash, // Browse manual
             };
 
@@ -486,6 +488,8 @@ public void LoadImage(string path)
 
         public bool LoadImage(Bitmap src)
         {
+            if (src == null) return false;
+
             try
             {
                 Bitmap img = (Bitmap)src.Clone();
@@ -679,8 +683,11 @@ public bool CreateInject()
                         ForwarderCreator();
                         break;
 
-                    default:
                     case Console.Flash:
+                        FlashInject();
+                        break;
+
+                    default:
                         throw new NotImplementedException();
                 }
 
@@ -719,7 +726,7 @@ public bool CreateInject()
             finally
             {
                 Creator.Out = null;
-                if (OutWAD != null) OutWAD.Dispose();
+                OutWAD = null;
                 Parent.CleanTemp();
                 if (VC != null) VC.Dispose();
             }
@@ -742,6 +749,11 @@ public void ForwarderCreator()
             OutWAD = f.CreateWAD(OutWAD, Forwarder_Mode.SelectedItem.ToString().ToLower() == "vwii");
         }
 
+        public void FlashInject()
+        {
+            OutWAD = Injectors.Flash.Inject(OutWAD, ROM.Path);
+        }
+
         public void WiiVCInject()
         {
             // Create Wii VC injector to use