summaryrefslogtreecommitdiff
path: root/src/event_object_movement.c
diff options
context:
space:
mode:
authorKaz <kazbloxmc@gmail.com>2020-09-16 19:27:55 -0400
committerKaz <kazbloxmc@gmail.com>2020-09-16 19:36:30 -0400
commit171154a0975b1c734b5b2069f1bdb3ca2bab26f2 (patch)
treef63da6a42d589c489a096d84080f0d7ea1ce6ce4 /src/event_object_movement.c
parent327dd877b5b9cd76fcd4747dea755395aacc6157 (diff)
Convert to -g; will be required for eliminating fakematches.
Diffstat (limited to 'src/event_object_movement.c')
-rw-r--r--src/event_object_movement.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 68f873446..0859fb32f 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1295,22 +1295,19 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *
{
u8 i = 0;
- for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT && gObjectEvents[i].active; i++)
{
- if (!gObjectEvents[i].active)
- break;
if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup)
return TRUE;
}
if (i >= OBJECT_EVENTS_COUNT)
return TRUE;
*objectEventId = i;
- do
+ for (; i < OBJECT_EVENTS_COUNT; i++)
{
if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup)
return TRUE;
- i++;
- } while (i < OBJECT_EVENTS_COUNT);
+ }
return FALSE;
}