Merge pull request #368 from Henny022p/item-metadata

This commit is contained in:
notyourav
2022-02-10 22:55:14 -08:00
committed by GitHub
13 changed files with 764 additions and 635 deletions
+3 -14
View File
@@ -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);
@@ -27,14 +28,6 @@ extern void (*const gUnk_0811E814[])(Entity*);
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;
@@ -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) {