mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-03 02:13:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match GetEmptyEntity

Browse Source
This commit is contained in:
hatal175
2022-03-28 17:33:37 +02:00
parent eb1158855b
commit 5015a4ac02
2 changed files with 11 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/entity.c
+11 -13
View File
@@ -232,9 +232,8 @@ void EraseAllEntities(void) {
extern Entity gUnk_030015A0[0x48];
NONMATCH("asm/non_matching/GetEmptyEntity.inc", Entity* GetEmptyEntity()) {
Entity* GetEmptyEntity() {
u8 flags_ip;
Entity* ptr;
Entity* end;
Entity* rv;
Entity* currentEnt;
@@ -244,24 +243,24 @@ NONMATCH("asm/non_matching/GetEmptyEntity.inc", Entity* GetEmptyEntity()) {
LinkedList* endListPtr;
if (gEntCount <= 0x46) {
ptr = gUnk_030015A0;
end = ptr + ARRAY_COUNT(gUnk_030015A0);
currentEnt = gUnk_030015A0;
end = currentEnt + ARRAY_COUNT(gUnk_030015A0);
do {
if (ptr->prev == 0) {
return ptr;
if (currentEnt->prev == 0) {
return currentEnt;
}
} while (++ptr < end);
} while (++currentEnt < end);
}
ptr = &gPlayerEntity;
currentEnt = &gPlayerEntity;
do {
if ((s32)ptr->prev < 0 && (ptr->flags & 0xc) && ptr != gUpdateContext.current_entity) {
ClearDeletedEntity(ptr);
return ptr;
if ((s32)currentEnt->prev < 0 && (currentEnt->flags & 0xc) && currentEnt != gUpdateContext.current_entity) {
ClearDeletedEntity(currentEnt);
return currentEnt;
}
} while (++ptr < (Entity*)&gCarriedEntity);
} while (++currentEnt < (Entity*)&gCarriedEntity);
flags_ip = 0;
rv = NULL;
@@ -290,7 +289,6 @@ NONMATCH("asm/non_matching/GetEmptyEntity.inc", Entity* GetEmptyEntity()) {
return rv;
}
END_NONMATCH
extern Entity gItemGetEntities[7];