diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/item.h | 3 | ||||
| -rw-r--r-- | include/object/itemOnGround.h | 18 | ||||
| -rw-r--r-- | include/room.h | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/include/item.h b/include/item.h index 5aa1913c..8d3cb920 100644 --- a/include/item.h +++ b/include/item.h @@ -5,7 +5,6 @@ #include "entity.h" #include "player.h" -extern u32 GiveItem(u32, u32); extern u32 CreateRandomItemDrop(Entity*, u32); extern void DisableRandomDrops(); extern void EnableRandomDrops(void); @@ -175,4 +174,6 @@ typedef enum { CREATE_ITEM_5, } CreateItemFunc; +extern u32 GiveItem(Item, u32); + #endif // ITEM_H diff --git a/include/object/itemOnGround.h b/include/object/itemOnGround.h index 151dcc28..65a6fc70 100644 --- a/include/object/itemOnGround.h +++ b/include/object/itemOnGround.h @@ -3,14 +3,28 @@ #include "entity.h" +typedef enum { + ITEM_ON_GROUND_KIND_0, + ITEM_ON_GROUND_KIND_1, + ITEM_ON_GROUND_KIND_2, + ITEM_ON_GROUND_KIND_3, + ITEM_ON_GROUND_KIND_4, + ITEM_ON_GROUND_KIND_5, + ITEM_ON_GROUND_KIND_6, + ITEM_ON_GROUND_BURRIED, + ITEM_ON_GROUND_SUNKEN, + ITEM_ON_GROUND_KIND_9, + ITEM_ON_GROUND_KIND_10, +} ItemOnGroundKind; + typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68; - /*0x69*/ u8 unk_69; + /*0x69*/ ItemOnGroundKind kind : 8; /*0x6a*/ u8 unk_6a; /*0x6b*/ u8 unused1[1]; /*0x6c*/ u16 unk_6c; - /*0x6e*/ u16 unk_6e; + /*0x6e*/ u16 originalTile; /*0x70*/ u8 unused2[22]; /*0x86*/ u16 flag; } ItemOnGroundEntity; diff --git a/include/room.h b/include/room.h index 1802a934..c391bea5 100644 --- a/include/room.h +++ b/include/room.h @@ -158,7 +158,7 @@ typedef struct { /* 0x2e */ u8 location; /* 0x2f */ u8 field2f; /* 0x30 */ u8 field30; - /* 0x31 */ u8 field31; + /* 0x31 */ u8 ezlo_startup_hint; /* 0x32 */ u8 field32; /* 0x33 */ u8 field33; #if defined(JP) || defined(EU) |