diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-01-23 17:24:55 +0200 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-01-23 17:24:55 +0200 |
| commit | 70e2ef587740bfa159528bc0b160bb89869ad925 (patch) | |
| tree | 766b21f8ce110a96d673e52e8cd7ac05072e5495 /src/object/book.c | |
| parent | a1ae3b229bf3767349849e3da29fe4fd2043eda3 (diff) | |
| parent | 85aaada18f7eace3284937c4da8db05f047d316b (diff) | |
Merge remote-tracking branch 'upstream/master' into coord
Diffstat (limited to 'src/object/book.c')
| -rw-r--r-- | src/object/book.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/book.c b/src/object/book.c index 7c3bf57e..790c5839 100644 --- a/src/object/book.c +++ b/src/object/book.c @@ -134,14 +134,14 @@ void sub_0809B56C(Entity* this) { fx = CreateFx(this, FX_DEATH, 0); if (fx) { - ResolveEntityOnTop(this, fx); + SortEntityAbove(this, fx); } } void sub_0809B5B4(Entity* this) { if (gPlayerState.flags & PL_MINISH) { sub_0800445C(this); - } else if (sub_08017850(this)) { + } else if (IsCollidingPlayer(this)) { CreateItemEntity(this->type + 0x39, 0, 0); DeleteThisEntity(); } |