diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-23 18:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 18:24:30 -0500 |
| commit | de2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch) | |
| tree | d8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/map_obj_lock.c | |
| parent | 294d223dd0218c64267b6b6851575150e36593fb (diff) | |
| parent | 22e6e3532900b2470d0134f1347981d77828b22c (diff) | |
Merge pull request #616 from huderlem/misc
Misc labeling
Diffstat (limited to 'src/map_obj_lock.c')
| -rw-r--r-- | src/map_obj_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index 3bd25dbdf..bac306cd8 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -52,7 +52,7 @@ void sub_8064D38(u8 taskId) sub_80594C0(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[gSelectedMapObject].mapobj_bit_1) + if (!task->data[1] && !gMapObjects[gSelectedMapObject].regularAnimActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); task->data[1] = 1; @@ -79,7 +79,7 @@ void LockSelectedMapObject(void) u8 taskId; FreezeMapObjectsExceptOne(gSelectedMapObject); taskId = CreateTask(sub_8064D38, 80); - if (!gMapObjects[gSelectedMapObject].mapobj_bit_1) + if (!gMapObjects[gSelectedMapObject].regularAnimActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); gTasks[taskId].data[1] = 1; |