dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Convert to -g; will be required for eliminating fakematches.

Browse Source
This commit is contained in:
Kaz
2020-09-16 19:27:55 -04:00
parent 327dd877b5
commit 171154a097
8 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/event_object_movement.c
View File

@@ -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;
}