From 482a3d657fdbedf01a69955ef34ba1d156d06cb2 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sat, 18 May 2024 04:56:52 -0400
Subject: [PATCH] Fix merge error

---
 src/unk_0203F6C4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index cb1d77744a..f367145e77 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -2970,7 +2970,7 @@ static BOOL ScrCmd_ApplyMovement (ScriptContext * ctx)
 {
     u16 localID = ScriptContext_GetVar(ctx);
     u32 movementOffset = ScriptContext_ReadWord(ctx);
-    LocalMapObject * object = sub_02040ED4(ctx->fieldSys, localID);
+    MapObject * object = sub_02040ED4(ctx->fieldSys, localID);
     if (object == NULL) {
         GF_ASSERT(FALSE);
         return FALSE;