fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT

2018-11-18 20:19:10 +01:00
parent 1b0cfb0757 0bbe03f170
commit 27ee7d567e
37 changed files with 2386 additions and 4655 deletions
--- 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)
        {