Using EntityKind enum in various places

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
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -283,7 +283,7 @@ void nullsub_510(Entity* this) {
void sub_08081328(Entity* this) {
Entity* other = this->child;
if (!(other->kind == 8 && other->id == 3)) {
if (!(other->kind == PLAYER_ITEM && other->id == 3)) {
sub_08081404(this, 0);
} else {
CopyPosition(other, this);