From f1fb0aedc94c944d1030fbde0107d9ed96d1465d Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Mon, 28 Sep 2020 21:33:04 -0700
Subject: [PATCH] address merge conflicts

---
 src/object/itemOnGround.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 22684903..ad8bdec9 100755
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -83,7 +83,7 @@ void ItemOnGround(Entity* this) {
 }
 
 void sub_08080F20(Entity* this) {
-    if (this->field_0x86 && CheckFlags(this->field_0x86)) {
+    if (this->field_0x86.HWORD && CheckFlags(this->field_0x86.HWORD)) {
         DeleteThisEntity();
     }
 
@@ -326,8 +326,8 @@ void sub_080813F0(Entity* this) {
 }
 
 void sub_08081404(Entity* this, u32 arg1) {
-    if (arg1 && this->field_0x86) {
-        SetFlag(this->field_0x86);
+    if (arg1 && this->field_0x86.HWORD) {
+        SetFlag(this->field_0x86.HWORD);
     }
 
     DeleteThisEntity();