falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address merge conflicts

This commit is contained in:
theo3 2020-09-28 21:33:04 -07:00
parent 8e9749a8c8
commit f1fb0aedc9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/object/itemOnGround.c
View File

@ -83,7 +83,7 @@ void ItemOnGround(Entity* this) {
} }
void sub_08080F20(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(); DeleteThisEntity();
} }
@ -326,8 +326,8 @@ void sub_080813F0(Entity* this) {
} }
void sub_08081404(Entity* this, u32 arg1) { void sub_08081404(Entity* this, u32 arg1) {
if (arg1 && this->field_0x86) { if (arg1 && this->field_0x86.HWORD) {
SetFlag(this->field_0x86); SetFlag(this->field_0x86.HWORD);
} }
DeleteThisEntity(); DeleteThisEntity();