diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/decoration_inventory.h | |
parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) |
fixing merge conflicts
Diffstat (limited to 'include/decoration_inventory.h')
-rw-r--r-- | include/decoration_inventory.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index e1fec36ea..7539f7240 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -1,12 +1,15 @@ #ifndef GUARD_DECORATION_INVENTORY_H #define GUARD_DECORATION_INVENTORY_H -struct DecorationInventory { + +struct DecorationInventory +{ u8 *items; u8 size; }; extern struct DecorationInventory gDecorationInventories[]; +void SetDecorationInventoriesPointers(void); void ClearDecorationInventories(void); s8 GetFirstEmptyDecorSlot(u8 idx); u8 CheckHasDecoration(u8); |