From edcf6ab93e449284aebfff7ff1a7f9456e3ba0ea Mon Sep 17 00:00:00 2001
From: AdAstra-LD <76622070+AdAstra-LD@users.noreply.github.com>
Date: Mon, 13 Jun 2022 15:16:02 +0200
Subject: [PATCH] Fixed error popping up when searching HGSS scripts

[+] Changed command names to match between DPPt-HGSS
---
 DS_Map/ROMFiles/ScriptCommand.cs   |  2 +-
 DS_Map/Resources/ScriptDatabase.cs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DS_Map/ROMFiles/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs
index 0ee1a10..4c783bb 100644
--- a/DS_Map/ROMFiles/ScriptCommand.cs
+++ b/DS_Map/ROMFiles/ScriptCommand.cs
@@ -76,7 +76,7 @@ namespace DSPRE.ROMFiles {
                 case 0x005E:      // Movement
                     name += $" {FormatNumber(parametersList[0], ParamTypeEnum.OW_ID)} {FormatNumber(parametersList[1], ParamTypeEnum.ACTION_ID)}";
                     break;
-                case 0x006A:      // CheckOverworldPosition
+                case 0x006A:      // GetOverworldPosition
                     name += FormatCmd_Overworld_TwoParams(parametersList);
                     break;
                 case 0x0062:      // Lock
diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs
index 03dc23d..e6c3c40 100644
--- a/DS_Map/Resources/ScriptDatabase.cs
+++ b/DS_Map/Resources/ScriptDatabase.cs
@@ -279,8 +279,8 @@ namespace DSPRE.Resources {
             [0x0066] = "LockCamera",
             [0x0067] = "ReleaseCamera",
             [0x0068] = "FacePlayer",
-            [0x0069] = "CheckPlayerPosition",
-            [0x006A] = "CheckOverworldPosition",
+            [0x0069] = "GetPlayerPosition",
+            [0x006A] = "GetOverworldPosition",
 
             [0x006C] = "KeepOverworld",
             [0x006D] = "SetOverworldMovement",
@@ -1733,8 +1733,8 @@ namespace DSPRE.Resources {
             [0x0066] = "LockCamera",
             [0x0067] = "ReleaseCamera",
             [0x0068] = "FacePlayer",
-            [0x0069] = "CheckPlayerPosition",
-            [0x006A] = "CheckOverworldPosition",
+            [0x0069] = "GetPlayerPosition",
+            [0x006A] = "GetOverworldPosition",
 
             [0x006C] = "KeepOverworld",
             [0x006D] = "SetOverworldMovement",
@@ -2760,7 +2760,7 @@ namespace DSPRE.Resources {
             [0x0284] = new byte[] { 2, 2, 2 },
             [0x0285] = new byte[] { 2, 2, 2 },
             [0x0286] = new byte[] { 2 },
-            [0x0287] = new byte[] { 2 },
+            [0x0287] = new byte[] { 2, 2 }, //To be checked!
             [0x0288] = new byte[] { 2 },
             [0x0289] = new byte[1] { 0 },
             [0x028A] = new byte[] { 2 },
@@ -2797,7 +2797,7 @@ namespace DSPRE.Resources {
             [0x02A9] = new byte[] { 2 },
             [0x02AA] = new byte[] { 2 },
             [0x02AB] = new byte[] { 2 },
-            [0x02AC] = new byte[1] { 0 },
+            [0x02AC] = new byte[] { 2 },
             [0x02AD] = new byte[] { 2, 2 },
             [0x02AE] = new byte[1] { 0 },
             [0x02AF] = new byte[] { 2 },