diff --git a/DS_Map/Resources/CommandsDatabase.cs b/DS_Map/Resources/CommandsDatabase.cs
index 68042dd..1cdcba5 100644
--- a/DS_Map/Resources/CommandsDatabase.cs
+++ b/DS_Map/Resources/CommandsDatabase.cs
@@ -76,7 +76,7 @@ namespace DSPRE.Resources {
                         }
                     } catch { }
 
-                    table.Rows[i].Cells[3].Value = paramSize;
+                    table.Rows[i].Cells[3].Value = paramSize.TrimEnd();
                 }
             }
         }
diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs
index 3f921dd..2282eb6 100644
--- a/DS_Map/Resources/ScriptDatabase.cs
+++ b/DS_Map/Resources/ScriptDatabase.cs
@@ -179,12 +179,12 @@ namespace DSPRE.Resources {
             [0x0008] = "AdrsRegSet",
             [0x0009] = "RegRegSet",
             [0x000A] = "AdrsAdrsSet",
-            [0x000B] = "IfRegReg",
-            [0x000C] = "IfRegValue",
-            [0x000D] = "IfRegAdrs",
-            [0x000E] = "IfAdrsReg",
-            [0x000F] = "IfAdrsValue",
-            [0x0010] = "IfAdrsAdrs",
+            [0x000B] = "CompareRegs",
+            [0x000C] = "CompareRegValue",
+            [0x000D] = "CompareRegAdrs",
+            [0x000E] = "CompareAdrsReg",
+            [0x000F] = "CompareAdrsValue",
+            [0x0010] = "CompareAdrsAdrs",
             [0x0011] = "CompareVarValue",
             [0x0012] = "CompareVars",
             [0x0013] = "ParallelCommonScript",
@@ -432,10 +432,17 @@ namespace DSPRE.Resources {
             [0x0133] = "GivePoketchApp",
             [0x0134] = "CheckPoketchApp",
 
+            [0x0147] = "MartScreen",
+            [0x0148] = "SpMartScreen",
+            [0x0149] = "GoodsMartScreen",
+            [0x014A] = "SealMartScreen",
             [0x014B] = "DummyLostBattle",
             [0x014C] = "SetLastWarp",
             [0x014D] = "CheckPlayerGender",
             [0x014E] = "HealPokemon",
+            [0x014F] = "DummyUnderground",
+
+            [0x0152] = "SetPlayerDirComm",
 
             [0x0157] = "CheckPokedex",
             [0x0158] = "GivePokedex",
@@ -490,6 +497,7 @@ namespace DSPRE.Resources {
             [0x018B] = "SetSpawnablePosition",
 
             [0x0190] = "WaitTimeOrAB",
+            [0x0191] = "PokemonSelectionScreen",
 
             [0x0193] = "GetSelectedPartySlot",
             [0x0198] = "GetPartyPokemonID",
@@ -754,9 +762,9 @@ namespace DSPRE.Resources {
             [0x0075] = new byte[] { 2, 2 },
             [0x0076] = new byte[1] { 0 },
             [0x0077] = new byte[1] { 0 },
-            [0x0078] = new byte[] { 2, 2, 2 },
+            [0x0078] = new byte[] { 2 },
             [0x0079] = new byte[] { 2 },
-            [0x007A] = new byte[] { 2, 2, 2 },
+            [0x007A] = new byte[] { 2 },
             [0x007B] = new byte[] { 2, 2, 2 },
             [0x007C] = new byte[] { 2, 2, 2 },
             [0x007D] = new byte[] { 2, 2, 2 },
@@ -828,7 +836,7 @@ namespace DSPRE.Resources {
             [0x00BF] = new byte[] { 2 },
             [0x00C0] = new byte[] { 2 },
             [0x00C1] = new byte[] { 2 },
-            [0x00C2] = new byte[] { 2 },
+            [0x00C2] = new byte[] { 2, 2, 2 },
             [0x00C3] = new byte[1] { 0 },
             [0x00C4] = new byte[1] { 0 },
             [0x00C5] = new byte[] { 2 },
@@ -875,7 +883,7 @@ namespace DSPRE.Resources {
             [0x00EE] = new byte[] { 2 },
             [0x00EF] = new byte[1] { 0 },
             [0x00F0] = new byte[1] { 0 },
-            [0x00F1] = new byte[1] { 0 },
+            [0x00F1] = new byte[] { 4 },
             [0x00F2] = new byte[] { 2, 2, 2, 2 },
             [0x00F3] = new byte[] { 2, 2, 2, 2 },
             [0x00F4] = new byte[1] { 0 },
@@ -1385,7 +1393,7 @@ namespace DSPRE.Resources {
         };
 
         public static Dictionary<ushort, string> DPScrCmdNames = new Dictionary<ushort, string>() {
-            [0x011D] = "ElevatorFloorWrite",
+            [0x011D] = "ElevatorBox",
 
             [0x0264] = "CheckBurmyForm",
         };
@@ -1590,12 +1598,12 @@ namespace DSPRE.Resources {
             [0x0008] = "AdrsRegSet",
             [0x0009] = "RegRegSet",
             [0x000A] = "AdrsAdrsSet",
-            [0x000B] = "IfRegReg",
-            [0x000C] = "IfRegValue",
-            [0x000D] = "IfRegAdrs",
-            [0x000E] = "IfAdrsReg",
-            [0x000F] = "IfAdrsValue",
-            [0x0010] = "IfAdrsAdrs",
+            [0x000B] = "CompareRegs",
+            [0x000C] = "CompareRegValue",
+            [0x000D] = "CompareRegAdrs",
+            [0x000E] = "CompareAdrsReg",
+            [0x000F] = "CompareAdrsValue",
+            [0x0010] = "CompareAdrsAdrs",
             [0x0011] = "CompareVarValue",
             [0x0012] = "CompareVars",
             [0x0013] = "ParallelCommonScript",