diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-29 15:54:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 15:54:12 -0800 |
| commit | 40dd696e1df6670f753406748189c508be6afbd7 (patch) | |
| tree | 7b861543f700a11a8b76f0d9819e3b3b6f6ce927 /src/object | |
| parent | c151aa886362c544e3cde8c950f442c2c359a709 (diff) | |
| parent | ad657a3823d27a8f43e5d17bd919a1bd64d6b37a (diff) | |
Merge pull request #327 from hatal175/entitykind
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/fileScreenObjects.c | 2 | ||||
| -rw-r--r-- | src/object/itemOnGround.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index c3d217f6..d2af86c9 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -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; diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index ec9b2bef..2643ade9 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -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); |