diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /include/decoration.h | |
parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) |
resolve 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 a51d9ccce..76b2f2ec4 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -70,5 +70,8 @@ void sub_8126968(void); void sub_8126AD8(u8 taskId); void sub_8127D38(u16 mapX, u16 mapY, u16 decor); void sub_8126B2C(u8 taskId); +void sub_8127208(u8 taskId); +void sub_8127250(u8 *dest, u8 decorCat); +bool8 IsSelectedDecorInThePC(void); #endif //GUARD_DECORATION_H |