diff options
| author | Henny022p <info@henny022.de> | 2022-01-31 17:30:51 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2022-01-31 17:30:51 +0100 |
| commit | 2a53ee4bf2ee7eea617280118c2188bffec77ae5 (patch) | |
| tree | 85ed631ab330f9ca3734bb77253a374e3ef0de21 /src/object/fileScreenObjects.c | |
| parent | 9b60d9c5e24ed592524c25a9dc013417d6e7ee0c (diff) | |
| parent | 2b8d880ffc0a4548d25dc613d53a908d36362d84 (diff) | |
merge master
Diffstat (limited to 'src/object/fileScreenObjects.c')
| -rw-r--r-- | src/object/fileScreenObjects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index 921b0b97..f68a531d 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -256,7 +256,7 @@ void sub_0808EB74(Entity* this) { this->x.WORD = entity->x.WORD; this->y.WORD = entity->y.WORD; this->spriteRendering.b3 = entity->spriteRendering.b3; - ResolveEntityBelow(entity, this); + SortEntityBelow(entity, this); } else { this->x.HALF.HI = 0xF000; this->y.HALF.HI = 0xF000; @@ -306,7 +306,7 @@ void sub_0808EBB8(Entity* this) { default: entity = sub_0808EC80(var0); if (entity) { - ResolveEntityBelow(entity, this); + SortEntityBelow(entity, this); this->spriteRendering.b3 = entity->spriteRendering.b3; x = entity->x.HALF.HI; y = entity->y.HALF.HI; @@ -322,7 +322,7 @@ static Entity* sub_0808EC80(int form) { Entity* entityA = (Entity*)&gEntityLists[6]; Entity* entityB = entityA->next; while (entityB != entityA) { - if ((entityB->kind == 0x6 && entityB->id == 0x48) && form == entityB->type) { + if ((entityB->kind == OBJECT && entityB->id == 0x48) && form == entityB->type) { return entityB; } entityB = entityB->next; |