summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-01-29 15:12:23 +0200
committerTal Hayon <talhayon1@gmail.com>2022-01-29 15:12:23 +0200
commit578fb3d1d86e141fa413f534cf633eb2779ce93b (patch)
treea8e255d788b0731505e8e2d74a68ed5422f98038 /src/object
parentfd9049f59801a77ced44d85329ee871fda031d22 (diff)
Using EntityKind enum in various places
Diffstat (limited to 'src/object')
-rw-r--r--src/object/fileScreenObjects.c2
-rw-r--r--src/object/itemOnGround.c2
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);