diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
| commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
| tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /src/event_object_movement.c | |
| parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
| parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) | |
Merge with master
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index ef125e564..ffa8f53c9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1144,7 +1144,7 @@ u8 GetFirstInactiveEventObjectId(void) u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { - if (localId < 0xFF) + if (localId < EVENT_OBJ_ID_PLAYER) { return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } |