diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
tree | 8793240342d37104610f34756f6fee9db706ee8f /include/map_obj_lock.h | |
parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/map_obj_lock.h')
-rw-r--r-- | include/map_obj_lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h index f7352be22..9fb57743e 100644 --- a/include/map_obj_lock.h +++ b/include/map_obj_lock.h @@ -7,7 +7,7 @@ bool8 sub_8064CFC(void); void ScriptFreezeMapObjects(void); void sub_8064D38(u8 taskId); bool8 sub_8064DB4(void); -void sub_8064DD8(void); +void LockSelectedMapObject(void); void sub_8064E2C(void); void unref_sub_8064E5C(void); void sub_8064EAC(void); |