From 590d5a6f7bb16444046c0a719ed9c1e5fa5e96e4 Mon Sep 17 00:00:00 2001 From: SiliconA-Z Date: Sat, 21 Mar 2026 20:05:35 -0400 Subject: [PATCH] Have GetAvailableObjectEventId match in all versions (#735) agbcc probably was affected by whatever assert was in whatever file in here and generated different code. --- src/event_object_movement.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 8110c247a..52043f9ff 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1495,30 +1495,19 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 * { u8 i = 0; -#if REVISION >= 0xA for (i = 0; i < OBJECT_EVENTS_COUNT && gObjectEvents[i].active; i++) -#else - for (i = 0; i < OBJECT_EVENTS_COUNT; i++) -#endif { - -#if REVISION >= 0xA -#else - if (!gObjectEvents[i].active) - break; -#endif 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; }