From a716f522f3599ecf073c7e302e3c72dbaac053c3 Mon Sep 17 00:00:00 2001
From: W1serV1ser <1prefertheaircauseimanairnomad@gmail.com>
Date: Wed, 6 Jul 2022 00:15:30 -0700
Subject: [PATCH] Merge adjustments

---
 src/event_object_movement.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index e5b6ad8b9..b06a51ac6 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -141,8 +141,6 @@ static u16 GetObjectEventFlagIdByObjectEventId(u8);
 static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *);
 static void MakeSpriteTemplateFromObjectEventTemplate(struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **);
 static void GetObjectEventMovingCameraOffset(s16 *, s16 *);
-static void LoadObjectEventPalette(u16);
-static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8);
 static void RemoveObjectEventIfOutsideView(struct ObjectEvent *);
 static void SpawnObjectEventOnReturnToField(u8, s16, s16);
 static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8);
@@ -2130,7 +2128,7 @@ u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 z, u8 d
         sprite->oam.paletteNum = IndexOfSpritePaletteTag(spriteTemplate.paletteTag);
         sprite->coordOffsetEnabled = TRUE;
         sprite->sVirtualObjId = virtualObjId;
-        sprite->sVirtualObjElev = elevation;
+        sprite->sVirtualObjElev = z;
         if (subspriteTables != NULL)
         {
             SetSubspriteTables(sprite, subspriteTables);