diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-02-10 22:55:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 22:55:14 -0800 |
| commit | 16d8e144888299dc2804579ad4b6c77bef8bd5bb (patch) | |
| tree | 9e551b369f97a3ad86f07f15247d50889b759209 /src/object | |
| parent | 37b8803cdcd0fa0aad5dfc9ea21af05014514281 (diff) | |
| parent | 4860ed1fe023da98867df36e7f35eb7ad581000f (diff) | |
Merge pull request #368 from Henny022p/item-metadata
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/itemOnGround.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 2643ade9..054f7411 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -4,8 +4,9 @@ #include "flags.h" #include "player.h" #include "object.h" -#include "functions.h" #include "item.h" +#include "itemMetaData.h" +#include "functions.h" void sub_08081150(Entity*); u8 sub_0808147C(u32); @@ -28,14 +29,6 @@ extern void (*const gUnk_0811E840[])(Entity*); extern Hitbox gUnk_080FD1A8; typedef struct { - u8 unk0[3]; - u8 unk3; - u8 unk4[4]; -} Unk_080FD5B4; - -extern const Unk_080FD5B4 gUnk_080FD5B4[]; - -typedef struct { u8 unk0[2]; u16 sfx; u8 unk4; @@ -348,11 +341,7 @@ bool32 sub_08081420(Entity* this) { } bool32 CheckShouldPlayItemGetCutscene(Entity* this) { - bool32 result = FALSE; - if ((gUnk_080FD5B4[this->type].unk0[3] & 0x2) || !GetInventoryValue(this->type)) { - result = TRUE; - } - return result; + return ((gItemMetaData[this->type].unk3 & 0x2) || !GetInventoryValue(this->type)); } u8 sub_0808147C(u32 arg0) { |