From 3104d00141739214813ac6aeb058b54ddfa5b6f6 Mon Sep 17 00:00:00 2001
From: AdAstra-LD <gianni.laiso.gl@gmail.com>
Date: Wed, 3 Feb 2021 19:13:32 +0100
Subject: [PATCH] Minor platinum cmd fixes

---
 DS_Map/DS Map.csproj                     |   4 +
 DS_Map/PokeDatabase.cs                   | 123 ++++++++++++++++++++++-
 DS_Map/Resources/ScriptParametersPt.resx |   4 +-
 DS_Map/packages.config                   |   4 +
 4 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 DS_Map/packages.config

diff --git a/DS_Map/DS Map.csproj b/DS_Map/DS Map.csproj
index 19f25ae..75923f7 100644
--- a/DS_Map/DS Map.csproj	
+++ b/DS_Map/DS Map.csproj	
@@ -67,6 +67,9 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -324,6 +327,7 @@
     <EmbeddedResource Include="WildEditorDPPt.resx">
       <DependentUpon>WildEditorDPPt.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/DS_Map/PokeDatabase.cs b/DS_Map/PokeDatabase.cs
index 228a744..6b68a3a 100644
--- a/DS_Map/PokeDatabase.cs
+++ b/DS_Map/PokeDatabase.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DSPRE {
     public static class PokeDatabase {
@@ -662,6 +659,126 @@ namespace DSPRE {
                 ["WaitMoveForever"] = 0x0068,
                 ["End"] = 0x00FE
             };
+
+            // Maybe for the future... we might convert the RESX sheets to compact dictionaries
+            public static Dictionary<ushort, (string, byte[], bool, bool)> DPPtCommands = new Dictionary<ushort, (string, byte[], bool, bool)>() {
+                [0x0000] = ("Nop",
+                null,
+                false,
+                false),
+
+                [0x0001] = ("Dummy",
+                null,
+                false,
+                false),
+
+                [0x0002] = ("End",
+                null,
+                false,
+                false),
+
+                [0x0003] = ("WaitTime",
+                new byte[2] { 16, 16 },
+                false,
+                false),
+
+                [0x0004] = ("RegValueSet",
+                new byte[2] { 8, 8 },
+                false,
+                false),
+
+                [0x0005] = ("RegDataSet",
+                new byte[2] { 8, 32 },
+                false,
+                false),
+
+                [0x0006] = ("RegAdrsSet",
+                new byte[2] { 8, 32 },
+                false,
+                false),
+
+                [0x0007] = ("AdrsValueSet",
+                new byte[2] { 32, 8 },
+                false,
+                false),
+
+                [0x0008] = ("AdrsRegSet",
+                new byte[2] { 32, 8 },
+                false,
+                false),
+
+                [0x0009] = ("RegRegSet",
+                new byte[2] { 8, 8 },
+                false,
+                false),
+
+                [0x000A] = ("AdrsAdrsSet",
+                new byte[2] { 32, 32 },
+                false,
+                false),
+
+                [0x000B] = ("IfRegReg",
+                new byte[2] { 8, 8 },
+                false,
+                false),
+
+                [0x000C] = ("IfRegValue",
+                new byte[2] { 8, 8 },
+                false,
+                false),
+
+                [0x000D] = ("IfRegAdrs",
+                new byte[2] { 8, 32 },
+                false,
+                false),
+
+                [0x000E] = ("IfAdrsReg",
+                new byte[2] { 32, 8 },
+                false,
+                false),
+
+                [0x000F] = ("IfAdrsValue",
+                new byte[2] { 32, 8 },
+                false,
+                false),
+
+                [0x0010] = ("IfAdrsAdrs",
+                new byte[2] { 32, 32 },
+                false,
+                false),
+
+                [0x0011] = ("IfVarValue",
+                new byte[2] { 16, 16 },
+                false,
+                false),
+
+                [0x0012] = ("IfVarVar",
+                new byte[2] { 16, 16 },
+                false,
+                false),
+
+                [0x0013] = (null,
+                new byte[1] { 16 },
+                false,
+                false),
+
+                [0x0014] = ("CommonScript",
+                new byte[1] { 16 },
+                false,
+                false),
+
+                [0x0015] = ("LocalScript",
+                null,
+                false,
+                false),
+
+                [0x0016] = ("Jump",
+                new byte[1] { 32 },
+                true,
+                false)
+            };
+            // 
+
             public static Dictionary<string, uint> headerOffsetsDict = new Dictionary<string, uint>() {
                 ["ADAE"] = 0xEEDBC,
                 ["APAE"] = 0xEEDBC,
diff --git a/DS_Map/Resources/ScriptParametersPt.resx b/DS_Map/Resources/ScriptParametersPt.resx
index 4bd8049..afe0516 100644
--- a/DS_Map/Resources/ScriptParametersPt.resx
+++ b/DS_Map/Resources/ScriptParametersPt.resx
@@ -2612,10 +2612,10 @@
     <value>2 1 2</value>
   </data>
   <data name="033F" xml:space="preserve">
-    <value>0</value>
+    <value>2 1 2</value>
   </data>
   <data name="0340" xml:space="preserve">
-    <value>0</value>
+    <value>2 1 2</value>
   </data>
   <data name="0341" xml:space="preserve">
     <value>4 1 2 2 1</value>
diff --git a/DS_Map/packages.config b/DS_Map/packages.config
new file mode 100644
index 0000000..8653b8e
--- /dev/null
+++ b/DS_Map/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
+</packages>
\ No newline at end of file