summaryrefslogtreecommitdiff
path: root/src/item_menu.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-14 08:08:51 -0500
committerGitHub <noreply@github.com>2018-06-14 08:08:51 -0500
commitbebcea402921d23232f7657fcfdab810f8699399 (patch)
treea59ea431d486bf23cde76e35ca789d1a0d113f3e /src/item_menu.c
parentf810c9ecade3d793a139f67cd8f63effc5644b99 (diff)
parente01dd90bb36f850fe88f2b1edae65c74b3bc48b1 (diff)
Merge pull request #263 from huderlem/event_object_movement
Sync event object movement with pokeruby
Diffstat (limited to 'src/item_menu.c')
-rwxr-xr-xsrc/item_menu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item_menu.c b/src/item_menu.c
index c4b4b15b1..0642c771e 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -9,7 +9,7 @@
#include "constants/songs.h"
#include "decompress.h"
#include "event_data.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "field_specials.h"
#include "graphics.h"
@@ -1716,7 +1716,7 @@ bool8 UseRegisteredKeyItemOnField(void)
if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE)
{
ScriptContext2_Enable();
- FreezeMapObjects();
+ FreezeEventObjects();
sub_808B864();
sub_808BCF4();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;