mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-27 14:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Using EntityKind enum in various places

Browse Source
This commit is contained in:
Tal Hayon
2022-01-29 15:12:23 +02:00
parent fd9049f598
commit 578fb3d1d8
12 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager28.c
+1 -1
View File
@@ -113,7 +113,7 @@ Entity* Manager28_FindMatchingEntity(EntityData* unk1) {
y = unk1->yPos + gRoomControls.origin_y;
tmp = &gEntityLists[4];
for (i = tmp->first; (u32)i != (u32)tmp; i = i->next) {
if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->id == i->id && 3 == i->kind && unk1->type == i->type) {
if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->id == i->id && ENEMY == i->kind && unk1->type == i->type) {
return i;
}
}
src/manager/managerB.c
+1 -1
View File
@@ -98,7 +98,7 @@ void ManagerB_LoadFight(Manager* this) {
if (prop) {
while (*((u8*)prop) != 0xFF) {
ent = LoadRoomEntity(prop++);
if (ent && (ent->kind == 3)) {
if (ent && (ent->kind == ENEMY)) {
ent->field_0x6c.HALF.HI |= 0x40;
ManagerBHelper_Monitor(monitor, ent, counter++);
}