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.h | |
parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
fix merge conflicts
Diffstat (limited to 'include/decoration.h')
-rw-r--r-- | include/decoration.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/decoration.h b/include/decoration.h index 2e83a9414..2595d491a 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -1,6 +1,8 @@ #ifndef GUARD_DECORATION_H #define GUARD_DECORATION_H +#include "task.h" + enum DecoId { /*000*/ DECOR_NONE, /*001*/ DECOR_SMALL_DESK, @@ -372,5 +374,6 @@ void sub_8100FB4(u8); void sub_810153C(u8); void sub_8101590(u8); void sub_8101848(u8); +void DoPlayerPCDecoration(u8); #endif // GUARD_DECORATION_H |