dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have GetAvailableObjectEventId match in all versions (#735)

Browse Source 
agbcc probably was affected by whatever assert was in whatever file in here and generated different code.
This commit is contained in:
SiliconA-Z
2026-03-21 20:05:35 -04:00
committed by GitHub
parent 3eac222192
commit 590d5a6f7b
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+2 -13
View File
@@ -1495,30 +1495,19 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *
{ {
u8 i = 0; u8 i = 0;
#if REVISION >= 0xA
for (i = 0; i < OBJECT_EVENTS_COUNT && gObjectEvents[i].active; i++) 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) if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup)
return TRUE; return TRUE;
} }
if (i >= OBJECT_EVENTS_COUNT) if (i >= OBJECT_EVENTS_COUNT)
return TRUE; return TRUE;
*objectEventId = i; *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) if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup)
return TRUE; return TRUE;
i++; }
} while (i < OBJECT_EVENTS_COUNT);
return FALSE; return FALSE;
} }