diff --git a/DS_Map/ROMFiles/ScriptAction.cs b/DS_Map/ROMFiles/ScriptAction.cs
index f935382..59fdd63 100644
--- a/DS_Map/ROMFiles/ScriptAction.cs
+++ b/DS_Map/ROMFiles/ScriptAction.cs
@@ -3,8 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace DSPRE.ROMFiles {
@@ -34,7 +32,7 @@ namespace DSPRE.ROMFiles {
             if (!PokeDatabase.ScriptEditor.movementsDictIDName.TryGetValue(id, out name))
                 name = id.ToString("X4");
 
-            if (repetitionCount != ushort.MaxValue)
+            if (repetitionCount != ushort.MaxValue && id != 0x00FE)
                 name += " " + "0x" + repetitionCount.ToString("X");
         }
         public ScriptAction(string wholeLine, int lineNumber) {
@@ -64,24 +62,29 @@ namespace DSPRE.ROMFiles {
             }
 
             /* Read parameters from remainder of the description */
+            /*
             if (id == 0x00FE) { 
                 return;
-            }
+            }*/
 
-            if (nameParts.Length > 2) {
+            if (nameParts.Length > 2) { //E.g.: LookUp 0x1 0x3
                 MessageBox.Show("Wrong number of parameters for action " + nameParts[0] + " at line " + lineNumber + "." + Environment.NewLine +
                     "Received: " + (nameParts.Length - 1) + Environment.NewLine + "Action Commands need at most one parameter. "
                     + Environment.NewLine + "\nThis Script File can not be saved.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 id = ushort.MaxValue; //ERROR VALUE
             } else {
-                NumberStyles style;
-                if (nameParts[1].StartsWith("0x")) { 
-                    style = NumberStyles.HexNumber;
-                    nameParts[1] = nameParts[1].Substring(2);
+                if (id == 0x00FE) {
+                    repetitionCount = 0;
                 } else {
-                    style = NumberStyles.Integer;
+                    NumberStyles style;
+                    if (nameParts[1].StartsWith("0x")) {
+                        style = NumberStyles.HexNumber;
+                        nameParts[1] = nameParts[1].Substring(2);
+                    } else {
+                        style = NumberStyles.Integer;
+                    }
+                    repetitionCount = ushort.Parse(nameParts[1], style);
                 }
-                repetitionCount = ushort.Parse(nameParts[1], style);
             }
         }
     }
diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs
index b8ea612..ee2ef45 100644
--- a/DS_Map/ROMFiles/ScriptFile.cs
+++ b/DS_Map/ROMFiles/ScriptFile.cs
@@ -118,7 +118,7 @@ namespace DSPRE.ROMFiles {
                         ushort id = scrReader.ReadUInt16();
                         if (id == 0xFE) {
                             endMovement = true;
-                            cmdList.Add(new ScriptAction(id));
+                            cmdList.Add(new ScriptAction(id, 0));
                         } else {
                             cmdList.Add(new ScriptAction(id, scrReader.ReadUInt16()));
                         }
@@ -572,8 +572,7 @@ namespace DSPRE.ROMFiles {
                             writer.Write(currentCmd.id);
 
                             /* Write movement command parameters */
-                            if (currentCmd.id != 0x00FE)
-                                writer.Write(currentCmd.repetitionCount);
+                            writer.Write(currentCmd.repetitionCount);
                         }
                     }
 
diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs
index eb081cb..ee26407 100644
--- a/DS_Map/Resources/PokeDatabase.cs
+++ b/DS_Map/Resources/PokeDatabase.cs
@@ -772,12 +772,12 @@ namespace DSPRE.Resources {
                 [0x0033] = "OpenMessage",
                 [0x0034] = "CloseMessage",
                 [0x0035] = "FreezeMessage",
-                [0x0036] = "MakeBoard",
-                [0x0037] = "BoardInfo",
+                [0x0036] = "SetIconBoard",
+                [0x0037] = "SetTextBoard",
                 [0x0038] = "ShowBoard",
                 [0x0039] = "WaitBoard",
                 [0x003A] = "BoardMessage",
-                [0x003B] = "EndBoard",
+                [0x003B] = "CloseBoard",
                 [0x003C] = "Menu",
 
                 [0x003E] = "YesNoBox",