diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/decoration_inventory.h | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'include/decoration_inventory.h')
| -rw-r--r-- | include/decoration_inventory.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index dd87e7239..afc354237 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -1,8 +1,10 @@ -// -// Created by Scott Norton on 6/5/17. -// +#ifndef GUARD_DECORATION_INVENTORY_H +#define GUARD_DECORATION_INVENTORY_H -#ifndef POKERUBY_DECORATION_INVENTORY_H -#define POKERUBY_DECORATION_INVENTORY_H +void ClearDecorationInventories(void); +u8 sub_8133FE4(u8); +u8 IsThereStorageSpaceForDecoration(u8); +u8 sub_8134074(u8); +s8 sub_81340A8(u8); -#endif //POKERUBY_DECORATION_INVENTORY_H +#endif // GUARD_DECORATION_INVENTORY_H |