diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
| commit | 27ee7d567e34b76c737c4920cfeccc36e6221543 (patch) | |
| tree | 8df67f69c86109bb42e060100e2390ed20b33c61 /src/event_object_movement.c | |
| parent | 1b0cfb075723af7b457ec118eca2888df449bf9e (diff) | |
| parent | 0bbe03f17030c8009508714fc2b41703f1a1310a (diff) | |
fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT
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 93be006ea..cd5a547a9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2559,7 +2559,7 @@ struct EventObjectTemplate *GetBaseTemplateForEventObject(const struct EventObje { return NULL; } - for (i = 0; i < 64; i++) // Using ARRAY_COUNT here results in the wrong conditional branch instruction (bls instead of ble) + for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId) { |